This commit is contained in:
X1627315083
2024-01-24 10:34:05 +08:00
parent 2672803163
commit 32e23b7492
17 changed files with 316 additions and 88 deletions

View File

@@ -1,4 +1,5 @@
NODE_ENV = 'development'
VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk'
# VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk'
# VUE_APP_BASE_URL = 'http://18.167.251.121:10086'
# VUE_APP_BASE_URL = 'http://192.168.1.9:5567'
VUE_APP_BASE_URL = 'http://192.168.1.6:7766'

View File

@@ -234,6 +234,7 @@ export default defineComponent({
let isMurmur = getCookie('isMurmur')//获取是否是试用用户
this.isMurmur =JSON.parse(isMurmur)
this.userInfo = JSON.parse(getCookie("userInfo"));
console.log(this.userInfo);
if (!this.userInfo) {
this.$router.replace("/login");
} else {

View File

@@ -301,7 +301,7 @@ export default defineComponent({
if(this.driver__.driver){
Generate.searchPictureName = 'Exit sign, door, sunset, ocean, surreal'
}else{
Generate.searchPictureName = ''
// Generate.searchPictureName = ''
}
}
},

View File

@@ -104,7 +104,8 @@
<div v-show="openClick == 3" class="modal_accomplish">
<div class="input_box Guide_1_2_8" :class="[inputShow?'active':'',driver__.driver?'showEvents':'']">
<input class="search_input" @input="ifMaximumLength" @keydown.enter="getgenerate" :maxlength='inputShow?0:9999' :class="{forbidden:generateCheckbox}" :readonly="generateCheckbox" :placeholder="$t('PrintboardUpload.inputContent1')" v-model="captionGeneration">
<div class="generage_btn started_btn" @click.stop="getgenerate">{{ $t('PrintboardUpload.Generate') }}</div>
<div v-if="!loadingShow" class="generage_btn started_btn" @click.stop="getgenerate">{{ $t('PrintboardUpload.Generate') }}</div>
<div v-else class="generage_btn started_btn" :class="[driver__.driver?'hideEvents':'']" @click.stop="removeGenerate">{{ $t('PrintboardUpload.Close') }}</div>
<span>{{ $t('PrintboardUpload.maximumLength') }}</span>
</div>
<div class="modal_img">
@@ -124,11 +125,14 @@
<a-checkbox v-model:checked="item.pin">{{ $t('PrintboardUpload.PIN') }}</a-checkbox>
</div>
</div>
</div>
<div class="mark_loading" v-show="loadingShow">
<a-spin size="large" />
<div class="mark_loading" v-show="loadingShow">
<a-spin size="large" />
<div class="mark_loading_text" v-show="generateLineUp > 0">
<div>{{ $t('PrintboardUpload.currently',{generateLineUp:generateLineUp}) }}</div>
</div>
</div>
</div>
</div>
</div>
<!-- 取消请求 -->
@@ -180,6 +184,10 @@ export default defineComponent({
let driver__:any = inject('driver__')
let {t} = useI18n()
let isTest = ref()
let userInfo:any = {}
let generateId:any = ref()
let generateTime:any = ref()
let generateLineUp:any = ref(0)
return {
fileList,
printImgList,
@@ -194,6 +202,10 @@ export default defineComponent({
driver__,
t,
isTest,
userInfo,
generateId,
generateTime,
generateLineUp,
}
},
computed:{
@@ -246,6 +258,8 @@ export default defineComponent({
}
},
mounted(){
let userInfo:any = getCookie("userInfo")
this.userInfo = JSON.parse(userInfo);
this.token = getCookie('token') || ''
let isTest:any = getCookie('isTest')
this.isTest =JSON.parse(isTest)
@@ -589,6 +603,7 @@ export default defineComponent({
level2Type:'',
text:`${generage.printModel.value},${this.captionGeneration}`,
timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
userId:this?.userInfo?.userId,
version:1,//为1就是Print
gender:'',
}
@@ -647,32 +662,72 @@ export default defineComponent({
this.loadingShow = true
//取消请求
// Https.axiosPost(Https.httpUrls.sketchAndPrintGenerate, data,{cancelToken: this.source?.token}).then(
Https.axiosPost(Https.httpUrls.sketchAndPrintGenerate, data).then(
Https.axiosPost(Https.httpUrls.generatePrepare, data).then(
(rv) => {
if(rv){
this.generateList = []
let arr
rv.generatedCollectionItems.forEach((v:any,index:number)=>{
arr = {
id:v.generateItemId,
imgUrl:v.generateItemUrl,
id_:GO.id++,
like:rv.generatedCollectionItems[index].isLiked
}
this.generateList.push(arr)
this.loadingShow = false
})
nextTick().then(()=>{
if(this.driver__.driver){
driverObj__.moveNext()
}
})
this.generateId = rv
this.setGenerate()
}else{
// this.loadingShow = false
}
}
).catch(res=>{
this.loadingShow = false
});
},
setGenerate(){
this.generateTime = setInterval(()=>{
let data = {uniqueId:this.generateId}
Https.axiosGet(Https.httpUrls.generateResult, {params:data}).then(
(rv) => {
if(rv.generateId){
this.generateLineUp = 0
this.generateList = []
let arr
rv.generatedCollectionItems.forEach((v:any,index:number)=>{
arr = {
id:v.generateItemId,
imgUrl:v.generateItemUrl,
id_:GO.id++,
like:rv.generatedCollectionItems[index].isLiked
}
this.generateList.push(arr)
this.loadingShow = false
})
nextTick().then(()=>{
if(this.driver__.driver){
driverObj__.moveNext()
}
})
clearInterval(this.generateTime)
}else if(rv.rankPosition == null){
this.generateLineUp = 0
// this.loadingShow = false
}else if(rv.rankPosition == 0){
this.generateLineUp = 0
// this.loadingShow = false
}else{
this.generateLineUp = rv.rankPosition
}
}
).catch(res=>{
});
},5000)
},
removeGenerate(){
if(this.generateId){
let data = {uniqueId:this.generateId}
Https.axiosGet(Https.httpUrls.generateStopWaiting, {params:data}).then(
(rv) => {
this.generateId = ''
this.loadingShow = false
this.generateLineUp = 0
clearInterval(this.generateTime)
}
).catch(res=>{
});
}
},
randomRange(min:any, max:any, num:any) { // min最小值max最大值 num排除的值
let index = Math.floor(Math.random() * (max - min)) + min;
while(index === num){

View File

@@ -180,7 +180,8 @@
<div v-show="openClick == 3" class="modal_accomplish">
<div class="input_box Guide_1_9_2" :class="[inputShow?'active':'',driver__.driver?'showEvents':'']">
<input class="search_input" @input="ifMaximumLength" @keydown.enter="getgenerate()" :maxlength='inputShow?0:9999' :class="{forbidden:generateCheckbox}" :readonly="generateCheckbox" :placeholder="$t('SketchboardUpload.inputContent1')" v-model="captionGeneration">
<div class="generage_btn started_btn" @click.stop="getgenerate">Generate</div>
<div v-if="!loadingShow" class="generage_btn started_btn" @click.stop="getgenerate">{{ $t('SketchboardUpload.Generate') }}</div>
<div v-else class="generage_btn started_btn" :class="[driver__.driver?'hideEvents':'']" @click.stop="removeGenerate">{{ $t('SketchboardUpload.Close') }}</div>
<span>{{ $t('SketchboardUpload.maximumLength') }}</span>
</div>
<div class="modal_img">
@@ -246,9 +247,12 @@
<a-checkbox v-model:checked="item.pin">{{ $t('SketchboardUpload.PIN') }}</a-checkbox>
</div>
</div>
</div>
<div class="mark_loading" v-show="loadingShow">
<a-spin size="large" />
<div class="mark_loading" v-show="loadingShow">
<a-spin size="large" />
<div class="mark_loading_text" v-show="generateLineUp > 0">
<div>{{ $t('Generate.currently',{generateLineUp:generateLineUp}) }}</div>
</div>
</div>
</div>
</div>
</div>
@@ -298,6 +302,10 @@ export default defineComponent({
let {t} = useI18n()
let driver__:any = inject('driver__')
let isTest = ref()
let userInfo:any = {}
let generateId:any = ref()
let generateTime:any = ref()
let generateLineUp:any = ref(0)
return {
fileList,
openClick,
@@ -313,6 +321,10 @@ export default defineComponent({
t,
driver__,
isTest,
userInfo,
generateId,
generateTime,
generateLineUp,
};
},
data() {
@@ -405,6 +417,8 @@ export default defineComponent({
}
},
mounted() {
let userInfo:any = getCookie("userInfo")
this.userInfo = JSON.parse(userInfo);
this.token = getCookie("token") || "";
let isTest:any = getCookie('isTest')
this.isTest =JSON.parse(isTest)
@@ -693,6 +707,7 @@ export default defineComponent({
level2Type:generage.level2Type,
text:this.captionGeneration,
timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
userId:this?.userInfo?.userId,
version:1,//为1就是Print
gender:this.workspace.sex,
}
@@ -749,34 +764,75 @@ export default defineComponent({
}
this.loadingShow = true
Https.axiosPost(Https.httpUrls.sketchAndPrintGenerate, data).then(
Https.axiosPost(Https.httpUrls.generatePrepare, data).then(
(rv) => {
if(rv){
this.generateList = []
let arr
rv.generatedCollectionItems.forEach((v:any,index:number)=>{
arr = {
id:v.generateItemId,
imgUrl:v.generateItemUrl,
category:generage.level2Type?generage.level2Type:sketchCatecoryList[0].name,
categoryValue:generage.level2Type?generage.level2Type:sketchCatecoryList[0].value,
id_:GO.id++,
like:v.isLiked
}
this.generateList.push(arr)
this.loadingShow = false
})
nextTick().then(()=>{
if(this.driver__.driver){
driverObj__.moveNext()
}
})
this.generateId = rv
this.setGenerate()
}
}
).catch(res=>{
this.loadingShow = false
});
},
setGenerate(){
let generage:any = this.$refs.Generate
let generateType = generage.checkbox.filter((v:any)=>v.type)[0].name
let sketchCatecoryList = this.sketchCatecoryList
this.generateTime = setInterval(()=>{
let data = {uniqueId:this.generateId}
Https.axiosGet(Https.httpUrls.generateResult, {params:data}).then(
(rv) => {
if(rv.generateId){
this.generateLineUp = 0
clearInterval(this.generateTime)
this.generateList = []
let arr
rv.generatedCollectionItems.forEach((v:any,index:number)=>{
arr = {
id:v.generateItemId,
imgUrl:v.generateItemUrl,
category:generage.level2Type?generage.level2Type:sketchCatecoryList[0].name,
categoryValue:generage.level2Type?generage.level2Type:sketchCatecoryList[0].value,
id_:GO.id++,
like:v.isLiked
}
this.generateList.push(arr)
this.loadingShow = false
})
nextTick().then(()=>{
if(this.driver__.driver){
driverObj__.moveNext()
}
})
}else if(rv.rankPosition == null){
this.generateLineUp = 0
// this.loadingShow = false
}else if(rv.rankPosition == 0){
this.generateLineUp = 0
// this.loadingShow = false
}else{
this.generateLineUp = rv.rankPosition
}
}
).catch(res=>{
});
},5000)
},
removeGenerate(){
if(this.generateId){
let data = {uniqueId:this.generateId}
Https.axiosGet(Https.httpUrls.generateStopWaiting, {params:data}).then(
(rv) => {
this.generateId = ''
this.loadingShow = false
this.generateLineUp = 0
clearInterval(this.generateTime)
}
).catch(res=>{
});
}
},
generageAdd(item:any){
item.type_ = {
type1: "generate",

View File

@@ -65,6 +65,8 @@ export default {
Organize:'组织',
Upload:'上传',
Generate:'生成',
Close:'取消',
currently:'您排在队列中的第{generateLineUp}位',
Delete:'删除',
Rename:'编辑',
Point:'点',
@@ -171,6 +173,8 @@ export default {
Upload:'上传',
Library:'收藏',
Generate:'生成',
Close:'取消',
currently:'您排在队列中的第{generateLineUp}位',
PIN:'PIN',
Maximum:'最多可上传{maxImg}张图片每张图片最大2M',
Thumbnail:'选择的服装缩略图',
@@ -188,6 +192,8 @@ export default {
Upload:'上传',
Library:'收藏',
Generate:'生成',
Close:'取消',
currently:'您排在队列中的第{generateLineUp}位',
PIN:'PIN',
Maximum:'最多可上传8张图片每张图片最大2M',
Thumbnail:'选择的印花缩略图',
@@ -264,6 +270,8 @@ export default {
Model3:'真实画风',
inputContent1:'输入生成图片的标题',
Generate:'生成',
Close:'取消',
currently:'您排在队列中的第{generateLineUp}位',
Merge:'合成',
maximumLength:'输入的内容超过允许输入的最大长度',
Model:'模型',
@@ -287,6 +295,7 @@ export default {
jsContent1:'因为您选择了多张图片,请点击布局后继续.',
jsContent2:'上传的文件不会保存,是否继续? ',
jsContent3:'您必须选择一种或多种颜色进行下一步。',
jsContent5:"我们检测到您的({str})上的PIN数量超过了八个这可能会导致一些已钉住的项目未被使用。您是否仍要继续",
},
DesignDetail:{
Details:'详情',

View File

@@ -65,6 +65,8 @@ export default {
Organize:'Organize',
Upload:'Upload',
Generate:'Generate',
Close:'Close',
currently:'You are currently in the {generateLineUp} th position in the queue',
Delete:'Delete',
Rename:'Edit',
Point:'Point',
@@ -171,6 +173,8 @@ export default {
Upload:'Upload',
Library:'Library',
Generate:'Generate',
Close:'Close',
currently:'You are currently in the {generateLineUp} th position in the queue',
PIN:'PIN',
Maximum:'Maximum {maxImg} images can be uploaded, Maximum 2M per image',
Thumbnail:'Thumbnail preview of selected sketchboard',
@@ -188,6 +192,8 @@ export default {
Upload:'Upload',
Library:'Library',
Generate:'Generate',
Close:'Close',
currently:'You are currently in the {generateLineUp} th position in the queue',
PIN:'PIN',
Maximum:'Maximum 8 images can be uploaded, Maximum 2M per image',
Thumbnail:'Thumbnail preview of selected printboard',
@@ -264,6 +270,8 @@ export default {
Model3:'Real Style',
inputContent1:'Input prompt',
Generate:'Generate',
Close:'Close',
currently:'You are currently in the {generateLineUp} th position in the queue',
Merge:'Merge',
maximumLength:'The entered content exceeds the maximum length.',
Model:'Model',

View File

@@ -66,6 +66,8 @@ export default {
Organize:'Organiser',
Upload:'Télécharger',
Generate:'Générer',
Close:'Fermer',
currently:"Vous êtes actuellement à la {generateLineUp}ème position dans la file d'attente.",
Delete:'Supprimer',
Rename:'Modifier',
Point:'point',
@@ -172,6 +174,8 @@ export default {
Upload:'Télécharger',
Library:'Bibliothèque',
Generate:'Générer',
Close:'Fermer',
currently:"Vous êtes actuellement à la {generateLineUp}ème position dans la file d'attente.",
PIN:'PIN',
Maximum:'Un maximum de {maxImg} images peuvent être téléchargées, maximum 2 M par image',
Thumbnail:'Aperçu miniature du tableau de croquis sélectionné',
@@ -189,6 +193,8 @@ export default {
Upload:'Télécharger',
Library:'Bibliothèque',
Generate:'Générer',
Close:'Fermer',
currently:"Vous êtes actuellement à la {generateLineUp}ème position dans la file d'attente.",
PIN:'PIN',
Maximum:'Un maximum de 8 images peuvent être téléchargées, maximum 2 M par image',
Thumbnail:"Aperçu miniature de la carte d'impression sélectionnée",
@@ -265,6 +271,8 @@ export default {
Model3:'Style réel',
inputContent1:'Saisie rapide',
Generate:'Générer',
Close:'Fermer',
currently:"Vous êtes actuellement à la {generateLineUp}ème position dans la file d'attente.",
Merge:'Fusionner',
maximumLength:'Le contenu saisi dépasse la longueur maximale.',
Model:'Modèle',
@@ -288,6 +296,7 @@ export default {
jsContent1:"Puisque vous avez sélectionné plusieurs images, veuillez cliquer sur « Mise en page » pour continuer.",
jsContent2:'Les fichiers téléchargés ne seront pas enregistrés, assurez-vous de continuer? ',
jsContent3:'Vous devez choisir une ou plusieurs couleurs pour un processus ultérieur.',
jsContent5:"Nous avons détecté que le nombre d'épingles sur votre ({str}) dépasse huit, ce qui peut entraîner l'inutilisation de certains éléments épinglés. Voulez-vous continuer quand même ?",
},
DesignDetail:{
Details:'Détails',

View File

@@ -65,6 +65,8 @@ export default {
Organize:'Organizzare',
Upload:'Caricamento',
Generate:'creare',
Close:'Chiudere',
currently:'Al momento ti trovi alla {generateLineUp}ª posizione nella coda.',
Delete:'Eliminare',
Rename:'Modificare',
Point:'Punto',
@@ -171,6 +173,8 @@ export default {
Upload:'Caricamento',
Library:'Biblioteca',
Generate:'creare',
Close:'Chiudere',
currently:'Al momento ti trovi alla {generateLineUp}ª posizione nella coda.',
PIN:'PIN',
Maximum:'È possibile caricare un massimo di {maxImg} immagini, massimo 2 milioni per immagine',
Thumbnail:'Anteprima in miniatura dello sketchboard selezionato',
@@ -188,6 +192,8 @@ export default {
Upload:'Caricamento',
Library:'Biblioteca',
Generate:'creare',
Close:'Chiudere',
currently:'Al momento ti trovi alla {generateLineUp}ª posizione nella coda.',
PIN:'PIN',
Maximum:'È possibile caricare un massimo di 8 immagini, massimo 2 milioni per immagine',
Thumbnail:'Anteprima in miniatura della scheda di stampa selezionata',
@@ -264,6 +270,8 @@ export default {
Model3:'Stile reale',
inputContent1:'Immissione rapida',
Generate:'creare',
Close:'Chiudere',
currently:'Al momento ti trovi alla {generateLineUp}ª posizione nella coda.',
Merge:'Unire',
maximumLength:'Il contenuto inserito supera la lunghezza massima.',
Model:'Modello',
@@ -287,6 +295,7 @@ export default {
jsContent1:'Poiché hai selezionato più immagini, fai clic su "Layout" per procedere',
jsContent2:'I file caricati non verranno salvati, assicurandosi di continuare? ',
jsContent3:"È necessario scegliere uno o più colori per l'ulteriore elaborazione.",
jsContent5:"Abbiamo rilevato che il numero di pin sul tuo ({str}) supera gli otto, il che potrebbe comportare l'inutilizzo di alcuni elementi fissati. Desideri continuare comunque?",
},
DesignDetail:{
Details:'Dettagli',

View File

@@ -65,6 +65,8 @@ export default {
Organize:'編成',
Upload:'アップロード',
Generate:'生成する',
Close:'閉じる',
currently:'現在、あなたは待ち行列の {generateLineUp} 番目の位置にいます。',
Delete:'消去',
Rename:'編集',
Point:'ポイント',
@@ -171,6 +173,8 @@ export default {
Upload:'アップロード',
Library:'集める',
Generate:'生成する',
Close:'閉じる',
currently:'現在、あなたは待ち行列の {generateLineUp} 番目の位置にいます。',
PIN:'PIN',
Maximum:'画像は最大{maxImg}枚アップロード可能、1枚あたり最大2M',
Thumbnail:'選択したスケッチボードのサムネイル プレビュー',
@@ -188,6 +192,8 @@ export default {
Upload:'アップロード',
Library:'集める',
Generate:'生成する',
Close:'閉じる',
currently:'現在、あなたは待ち行列の {generateLineUp} 番目の位置にいます。',
PIN:'PIN',
Maximum:'画像は最大8枚アップロード可能、1枚あたり最大2M',
Thumbnail:'選択したプリントボードのサムネイル プレビュー',
@@ -264,6 +270,8 @@ export default {
Model3:'リアルなスタイル',
inputContent1:'プロンプト入力',
Generate:'生成する',
Close:'閉じる',
currently:'現在、あなたは待ち行列の {generateLineUp} 番目の位置にいます。',
Model:'モデル',
Merge:'マージ',
maximumLength:'入力した内容が最大長を超えています.',
@@ -287,6 +295,7 @@ export default {
jsContent1:'複数の画像を選択したため、「レイアウト」をクリックして次に進んでください。',
jsContent2:'アップロードされたファイルは保存されません。続行しますか? ',
jsContent3:'以降の処理には 1 つ以上の色を選択する必要があります。',
jsContent5:"({str}) に設定されたピンの数が8を超えています。これにより、ピン留めされたアイテムの一部が使用されない可能性があります。それでも続行しますか",
},
DesignDetail:{
Details:'詳細',

View File

@@ -65,6 +65,8 @@ export default {
Organize:'구성',
Upload:'업로드',
Generate:'생성하다',
Close:'닫기',
currently:'현재 대기열에서 {generateLineUp} 번째 위치에 있습니다.',
Delete:'삭제',
Rename:'편집하다',
Point:'점',
@@ -171,6 +173,8 @@ export default {
Upload:'업로드',
Library:'도서관',
Generate:'생성하다',
Close:'닫기',
currently:'현재 대기열에서 {generateLineUp} 번째 위치에 있습니다.',
PIN:'PIN',
Maximum:'최대 {maxImg}개의 이미지를 업로드할 수 있으며, 이미지당 최대 2M',
Thumbnail:'선택한 스케치보드의 썸네일 미리보기',
@@ -188,6 +192,8 @@ export default {
Upload:'업로드',
Library:'도서관',
Generate:'생성하다',
Close:'닫기',
currently:'현재 대기열에서 {generateLineUp} 번째 위치에 있습니다.',
PIN:'PIN',
Maximum:'최대 8개의 이미지를 업로드할 수 있으며, 이미지당 최대 2M',
Thumbnail:'선택한 프린트보드의 썸네일 미리보기',
@@ -264,6 +270,8 @@ export default {
Model3:'리얼 스타일',
inputContent1:'프롬프트 입력',
Generate:'생성하다',
Close:'닫기',
currently:'현재 대기열에서 {generateLineUp} 번째 위치에 있습니다.',
Merge:'병합',
maximumLength:'입력한 내용이 최대 길이를 초과했습니다.',
Model:'모델1',
@@ -287,6 +295,7 @@ export default {
jsContent1:"여러 이미지를 선택했으므로 계속하려면 '레이아웃'을 클릭하세요.",
jsContent2:'업로드한 파일은 저장되지 않습니다. 계속하시겠습니까? ',
jsContent3:'추가 처리를 위해 하나 이상의 색상을 선택해야 합니다.',
jsContent5:"우리는 ({str})에 있는 핀의 수가 8개를 초과하여 일부 핀이 사용되지 않을 수 있다는 것을 감지했습니다. 그래도 계속하시겠습니까?",
},
DesignDetail:{
Details:'세부',

View File

@@ -65,6 +65,8 @@ export default {
Organize:'Организовать',
Upload:'Загрузить',
Generate:'Генерировать',
Close:'Закрыть ',
currently:'В данный момент вы находитесь на {generateLineUp} позиции в очереди.',
Delete:'Удалить',
Rename:'Редактировать',
Point:'точка',
@@ -171,6 +173,8 @@ export default {
Upload:'Загрузить',
Library:'Библиотека',
Generate:'Генерировать',
Close:'Закрыть ',
currently:'В данный момент вы находитесь на {generateLineUp} позиции в очереди.',
PIN:'PIN',
Maximum:'Можно загрузить максимум {maxImg} изображений, максимум 2 М на изображение.',
Thumbnail:'Предварительный просмотр миниатюр выбранной эскизной панели',
@@ -188,6 +192,8 @@ export default {
Upload:'Загрузить',
Library:'Библиотека',
Generate:'Генерировать',
Close:'Закрыть ',
currently:'В данный момент вы находитесь на {generateLineUp} позиции в очереди.',
PIN:'PIN',
Maximum:'Можно загрузить максимум 8 изображений, максимум 2 М на изображение.',
Thumbnail:'Предварительный просмотр миниатюр выбранной печатной платы',
@@ -219,6 +225,8 @@ export default {
Upload:'Загрузить',
Library:'Библиотека',
Generate:'Генерировать',
Close:'Закрыть ',
currently:'В данный момент вы находитесь на {generateLineUp} позиции в очереди.',
Delete:'Удалить',
Maximum:'Можно загрузить максимум 8 изображений, максимум 2 М на изображение.',
Thumbnail:'Предварительный просмотр миниатюр выбранного мудборда',
@@ -264,6 +272,8 @@ export default {
Model3:'Реалистический стиль',
inputContent1:'Быстрый ввод',
Generate:'Генерировать',
Close:'Закрыть ',
currently:'В данный момент вы находитесь на {generateLineUp} позиции в очереди.',
Merge:'слияние',
maximumLength:'Введенный контент превышает максимальную длину.',
Model:'Модель',
@@ -287,6 +297,7 @@ export default {
jsContent1:'Поскольку вы выбрали несколько изображений, нажмите «Макет», чтобы продолжить.',
jsContent2:'Загруженные файлы не сохранятся, обязательно продолжайте? ',
jsContent3:'Вы должны выбрать один или несколько цветов для дальнейшей обработки..',
jsContent5:"Мы обнаружили, что количество закрепленных элементов ({str}) превышает восемь, что может привести к невозможности использования некоторых закрепленных элементов. Хотите продолжить?",
},
DesignDetail:{
Details:'Подробности',

View File

@@ -65,6 +65,8 @@ export default {
Organize:'จัดระเบียบ',
Upload:'อัปโหลด',
Generate:'กำเนิด',
Close:'ปิด',
currently:'คุณอยู่ในตำแหน่งที่ {generateLineUp} ในคิว',
Delete:'ลบ',
Rename:'แก้ไข',
Point:'จุด',
@@ -171,6 +173,8 @@ export default {
Upload:'อัปโหลด',
Library:'ห้องสมุด',
Generate:'กำเนิด',
Close:'ปิด',
currently:'คุณอยู่ในตำแหน่งที่ {generateLineUp} ในคิว',
PIN:'PIN',
Maximum:'สามารถอัพโหลดภาพได้สูงสุด {maxImg} ภาพ สูงสุด 2M ต่อภาพ',
Thumbnail:'ภาพตัวอย่างขนาดย่อของกระดานร่างภาพที่เลือก',
@@ -188,6 +192,8 @@ export default {
Upload:'อัปโหลด',
Library:'ห้องสมุด',
Generate:'กำเนิด',
Close:'ปิด',
currently:'คุณอยู่ในตำแหน่งที่ {generateLineUp} ในคิว',
PIN:'PIN',
Maximum:'สามารถอัพโหลดภาพได้สูงสุด 8 ภาพ สูงสุด 2M ต่อภาพ',
Thumbnail:'ภาพตัวอย่างขนาดย่อของบอร์ดพิมพ์ที่เลือก',
@@ -264,6 +270,8 @@ export default {
Model3:'สไตล์แบบจริง',
inputContent1:'ป้อนข้อมูลทันที',
Generate:'กำเนิด',
Close:'ปิด',
currently:'คุณอยู่ในตำแหน่งที่ {generateLineUp} ในคิว',
Merge:'รวมเข้าด้วยกัน',
maximumLength:'เนื้อหาที่ป้อนเกินความยาวสูงสุด.',
Model:'แบบอย่าง',
@@ -287,6 +295,7 @@ export default {
jsContent1:"เนื่องจากคุณได้เลือกภาพหลายภาพ โปรดคลิก 'เค้าโครง' เพื่อดำเนินการต่อ",
jsContent2:'ไฟล์ที่อัพโหลดจะไม่ถูกบันทึก โปรดดำเนินการต่อ? ',
jsContent3:'คุณต้องเลือกหนึ่งสีขึ้นไปเพื่อดำเนินการต่อไป.',
jsContent5:"เราตรวจพบว่าจำนวนหมุดใน ({str}) เกิน 8 หมุด ซึ่งอาจทำให้บางรายการหมุดไม่ได้ถูกใช้ คุณต้องการดำเนินการต่อหรือไม่?",
},
DesignDetail:{
Details:'รายละเอียด',

View File

@@ -65,6 +65,8 @@ export default {
Organize:'Tổ chức',
Upload:'Tải lên',
Generate:'Phát ra',
Close:'Đóng',
currently:'Bạn hiện đang ở vị trí thứ {generateLineUp} trong hàng đợi.',
Delete:'Xóa bỏ',
Rename:'Biên tập',
Point:'điểm',
@@ -171,6 +173,8 @@ export default {
Upload:'Tải lên',
Library:'Thư viện',
Generate:'Phát ra',
Close:'Đóng',
currently:'Bạn hiện đang ở vị trí thứ {generateLineUp} trong hàng đợi.',
PIN:'PIN',
Maximum:'Có thể tải lên tối đa {maxImg} hình ảnh, Tối đa 2M mỗi hình ảnh',
Thumbnail:'Xem trước hình thu nhỏ của bảng phác thảo đã chọn',
@@ -188,6 +192,8 @@ export default {
Upload:'Tải lên',
Library:'Thư viện',
Generate:'Phát ra',
Close:'Đóng',
currently:'Bạn hiện đang ở vị trí thứ {generateLineUp} trong hàng đợi.',
PIN:'PIN',
Maximum:'Có thể tải lên tối đa 8 hình ảnh, Tối đa 2M mỗi hình ảnh',
Thumbnail:'Xem trước hình thu nhỏ của bảng in đã chọn',
@@ -264,6 +270,8 @@ export default {
Model3:'Phong cách thực tế',
inputContent1:'Nhập liệu nhanh chóng',
Generate:'Phát ra',
Close:'Đóng',
currently:'Bạn hiện đang ở vị trí thứ {generateLineUp} trong hàng đợi.',
Merge:'hợp nhất',
maximumLength:'Nội dung đã nhập vượt quá độ dài tối đa.',
Model:'người mẫu',
@@ -287,6 +295,7 @@ export default {
jsContent1:"Vì bạn đã chọn nhiều hình ảnh, vui lòng nhấp vào 'Bố cục' để tiếp tục",
jsContent2:'Các tập tin đã tải lên sẽ không được lưu, hãy nhớ tiếp tục? ',
jsContent3:'Bạn phải chọn một hoặc nhiều màu để xử lý tiếp.',
jsContent5:"Chúng tôi đã phát hiện ra rằng số lượng ghim trên ({str}) của bạn vượt quá tám, điều này có thể dẫn đến việc một số mục đã ghim không được sử dụng. Bạn có muốn tiếp tục không?",
},
DesignDetail:{
Details:'Chi tiết',

View File

@@ -61,28 +61,6 @@ const router = createRouter({
router.beforeEach((to, from, next) => {
// // 获取路由配置对象
// const route = router.resolve({ path: '/' }).route
// // 修改重定向
// route.redirect = '/new-path'
// router.addRoute(route)
// next();
// let token = getCookie("token");
// console.log(to,from);
// if(from.path == '/' && !token){
// console.log(111);
// murmur().then((rv)=>{
// console.log(rv);
// if(rv){
// console.log(123123);
// next({ name: 'history' });
// }
// })
// }else{
// console.log(333);
// next()
// }
//系统维护
// const toName = to.name === 'upgrade';
// if (toName) {

View File

@@ -405,6 +405,10 @@
<!-- 蒙层 start-->
<div class="mark_loading" v-show="isShowMark">
<a-spin size="large" />
<div class="mark_loading_text" v-show="isGenerate">
<div v-show="generateLineUp > 0">{{ $t('Generate.currently',{generateLineUp:generateLineUp}) }}</div>
<div class="mark_loading_btn" @click="removeGenerate">{{$t('LibraryPage.Close')}}</div>
</div>
</div>
<!-- 蒙层 end-->
<RobotAssist></RobotAssist>
@@ -428,6 +432,7 @@ import { getCookie } from "@/tool/cookie";
import scaleImage from "@/component/HomePage/scaleImage.vue";
import { useI18n } from "vue-i18n";
import { ElCascader } from 'element-plus'
import { remove } from "jszip";
export default defineComponent({
components: {
HeaderComponent,
@@ -534,7 +539,10 @@ export default defineComponent({
let driver__:any = computed(()=>{
return store.state.Guide.guide
})
let generateId:any = ref()
let generateTime:any = ref()
let generateLineUp:any = ref(0)
let isGenerate:any = ref(false)
return {
menuList,
selectImgList,
@@ -573,7 +581,11 @@ export default defineComponent({
props,
intersection,
isTest,
driver__
driver__,
generateId,
generateTime,
generateLineUp,
isGenerate,
}
},
data(this_) {
@@ -1242,6 +1254,7 @@ export default defineComponent({
collectionElementId:generageImg?.id,
level1Type:this.selectCode,
level2Type:this.selectCode == 'Sketchboard'?this.designType.value:'',
userId:(this?.userInfo as any).userId,
text:this.selectCode == 'Printboard'?`${arr[this.printModel.num-1]},${this.captionGeneration}`:this.captionGeneration,
timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
version:1,//为1就是Print
@@ -1301,28 +1314,70 @@ export default defineComponent({
}
}
this.isShowMark = true
Https.axiosPost(Https.httpUrls.sketchAndPrintGenerate, data).then(
this.isGenerate = true
Https.axiosPost(Https.httpUrls.generatePrepare, data).then(
(rv) => {
if(rv){
let arr
rv.generatedCollectionItems.forEach((v:any,index:number)=>{
arr = {
id:v.generateItemId,
imgUrl:v.generateItemUrl,
like:v.isLiked
}
// this.generateList.push(arr)
this.generateList.unshift(arr)
})
this.isShowMark = false
this.generateId = rv
this.setGenerate()
}
}
).catch(res=>{
this.isShowMark = false
this.isGenerate = false
});
},
setGenerate(){
this.generateTime = setInterval(()=>{
let data = {uniqueId:this.generateId}
Https.axiosGet(Https.httpUrls.generateResult, {params:data}).then(
(rv) => {
if(rv.generateId){
this.generateLineUp = 0
clearInterval(this.generateTime)
let arr
rv.generatedCollectionItems.forEach((v:any,index:number)=>{
arr = {
id:v.generateItemId,
imgUrl:v.generateItemUrl,
like:v.isLiked
}
// this.generateList.push(arr)
this.generateList.unshift(arr)
})
// this.isShowMark = false
this.isGenerate = false
this.isShowMark = false
}else if(rv.rankPosition == null){
this.generateLineUp = 0
// this.isShowMark = false
}else if(rv.rankPosition == 0){
this.generateLineUp = 0
// this.isShowMark = false
}else{
this.generateLineUp = rv.rankPosition
}
}
).catch(res=>{
});
},5000)
},
removeGenerate(){
if(this.generateId){
let data = {uniqueId:this.generateId}
Https.axiosGet(Https.httpUrls.generateStopWaiting, {params:data}).then(
(rv) => {
this.generateId = ''
this.isShowMark = false
this.isGenerate = false
this.generateLineUp = 0
clearInterval(this.generateTime)
}
).catch(res=>{
});
}
},
dropdownVisibleChange1(){
let element:any = this.$refs.cascader1
let el = element.contentRef?.getElementsByClassName('el-cascader-menu__empty-text')?.[0]

View File

@@ -37,7 +37,7 @@ module.exports = defineConfig({
}
}
},
https:true,
// https:true,
},
pluginOptions: {
"style-resources-loader": {