From 40ef204dfd404eb58d400e50b95a9f3698881e7f Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Wed, 27 Mar 2024 09:48:01 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=AD=E8=A8=80=E9=80=82=E9=85=8D=E5=92=8C?= =?UTF-8?q?=E8=B6=85=E5=88=86=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.dev | 4 +- src/component/HomePage/ExportModel.vue | 4 +- src/component/HomePage/TaskPage.vue | 45 +++++++++++++-------- src/lang/cn.ts | 56 ++++++++++++++++++++++++++ src/lang/en.ts | 7 ++-- src/views/HomeMain.vue | 8 ++-- src/views/HomeView/HomeView.vue | 4 +- 7 files changed, 98 insertions(+), 30 deletions(-) diff --git a/.env.dev b/.env.dev index dd5ff006..d429345a 100644 --- a/.env.dev +++ b/.env.dev @@ -3,6 +3,6 @@ NODE_ENV = 'development' # VUE_APP_BASE_URL = 'https://api.aida.com.hk' # VUE_APP_BASE_URL = 'http://18.167.251.121:10086' -# 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://192.168.1.9:17088' -VUE_APP_BASE_URL = 'http://192.168.1.7:5567' +# VUE_APP_BASE_URL = 'http://192.168.1.7:5567' diff --git a/src/component/HomePage/ExportModel.vue b/src/component/HomePage/ExportModel.vue index 51fd58d5..aae8ebf4 100644 --- a/src/component/HomePage/ExportModel.vue +++ b/src/component/HomePage/ExportModel.vue @@ -690,7 +690,7 @@ export default defineComponent({ //关闭画布 let cancelDsign = () => { Modal.confirm({ - title: 'Canvas edit content is not saved, whether to leave the page', + title: useI18n().t('exportModel.jsContent1'), okText: 'Yes', cancelText: 'No', mask:false, @@ -1450,7 +1450,7 @@ export default defineComponent({ } Https.axiosPost(Https.httpUrls.prepareForSR, data).then((rv) => { store.dispatch('getCredits') - emit('setTask') + emit('setTask',rv) cancelSRExport() }); } diff --git a/src/component/HomePage/TaskPage.vue b/src/component/HomePage/TaskPage.vue index 2ec80030..b18fd5c5 100644 --- a/src/component/HomePage/TaskPage.vue +++ b/src/component/HomePage/TaskPage.vue @@ -141,10 +141,13 @@ export default defineComponent({ let dom = document.querySelector('.task_page .task_content_select') return dom }, - init(){ + init(data:any){ this.visible = true // this.getTaskList() - this.getTaskMoreList() + this.currentPage = 1 + // setTimeout(() => { + this.getTaskMoreList() + // }, 1000); }, sort(arr:any){ arr.sort((a:any, b:any) => { @@ -157,7 +160,7 @@ export default defineComponent({ afterVisibleChange(bool:any){ if(!bool){ // clearTimeout(this.getTaskTime) - // this.taskListMore = [] + this.taskListMore = [] } }, visibleChange(){ @@ -170,24 +173,34 @@ export default defineComponent({ getTaskList(){ clearTimeout(this.getTaskTime) let arr = this.taskListUnfinished.map((item:any) => item.taskId) - console.log(arr,this.taskListUnfinished); if(arr <= 0){ return } Https.axiosPost(Https.httpUrls.getTasksList,arr).then((rv)=>{ this.taskListUnfinished.forEach((item:any,index:number) => { - let rvIndex = rv.findIndex((rvItem:any)=>{ - if(rvItem.status == 'success'){ - downloadIamge(item.outputImage,item.imageName) + rv.forEach((rvItem:any) => { + if(item.taskId==rvItem.taskId && rvItem.status == 'success'){ + downloadIamge(rvItem.outputImage,rvItem.imageName) + let itemIndex = item.index + this.taskListUnfinished[index] = rvItem + this.taskListUnfinished[index].index = itemIndex + this.taskListMore[itemIndex] = rvItem + this.taskListMore[itemIndex].inputImage = rvItem.inputParam.images } - return rvItem.taskId == item.taskId - }) - item = rv[rvIndex] - this.taskListMore[item.index] = rv[rvIndex] - console.log(this.taskListUnfinished); + }); + // let itemIndex = item.index + // let rvIndex = rv.findIndex((rvItem:any)=>{ + // if(rvItem.status == 'success'){ + // downloadIamge(rvItem.outputImage,rvItem.imageName) + // } + // return rvItem.taskId == item.taskId + // }) + // this.taskListUnfinished[index] = rv[rvIndex] + // this.taskListUnfinished[index].index = itemIndex + // this.taskListMore[itemIndex] = rv[rvIndex] }); - this.taskListUnfinished.filter((unfinishedItem:any)=>{ - return unfinishedItem.status == 'Waiting' || unfinishedItem.status == 'Executing' + this.taskListUnfinished = this.taskListUnfinished.filter((unfinishedItem:any)=>{ + return (unfinishedItem.status == 'Waiting' || unfinishedItem.status == 'Executing') }) // this.taskList = this.sort(rv) // let isSuccess = rv.filter((item:any) => item.status == 'Waiting' || item.status == 'Executing') @@ -206,8 +219,8 @@ export default defineComponent({ endTime: "", startTime: "", } - this.currentPage += 1 Https.axiosPost(Https.httpUrls.getTasksHistory,data).then((rv)=>{ + this.currentPage += 1 if(this.currentPage > 1 && rv.content.length == 0){ this.currentPage = 1 this.getTaskMoreList() @@ -221,8 +234,6 @@ export default defineComponent({ this.taskListUnfinished.push(item) } }) - console.log(this.getTaskTime); - if(!this.getTaskTime){ this.getTaskList() } diff --git a/src/lang/cn.ts b/src/lang/cn.ts index 55e3828a..7b6a17ac 100644 --- a/src/lang/cn.ts +++ b/src/lang/cn.ts @@ -14,10 +14,66 @@ export default { verification:'输入验证码', SentTo:'发送', Resend:'重发', + Credits:'积分', + TaskList:'任务列表', + ViewOrders:'查询订单', jsContent1:'邮箱格式不正确', jsContent2:'绑定邮箱成功', jsContent3:`已经长时间未操作，您必须活跃起来，否则将会在{numTime} S 后退出登录`, }, + allOrder:{ + Time:'时间', + Serial:'序号', + Title:'名字', + Money:'金额', + Payment:'支付方式', + State:'状态', + Income:'支出', + Expend:'收入', + }, + payOrder:{ + OrderInformation:'订单详情', + CreditsInformation:'积分详情', + }, + exportModel:{ + EditExport:'编辑 & 导出', + CanvasSize:'画布大小', + Height:'高', + CanvasNav:'缩略图', + CanvasTool:'画布工具', + Color:'颜色', + Size:'大小', + Brushwork:'绘画', + Texture:'材质', + FillBack:'填充 & 边', + Layer:'层级', + More:'更多', + insufficient:'您的积分余额不足，如需使用此功能，请点击左上角充值', + HDExport:'高清导出', + Export:'导出', + SR:'请选择需要SR的图片', + requiresCredits:'每张图片需要消耗300积分', + Scale:'倍率', + Cancel:'取消', + jsContent1:'画布内容没有保存是否离开页面', + }, + upgradePlan:{ + BuyCredlts:'购买积分', + credits:'积分', + organization:'积分再任意场景都可以使用', + Continue:'继续', + payment:'选择付款方式', + Cancel:'取消', + Payment:'付款', + completed:'是否已完成支付？', + hint:'请保持窗口打开，直到付款完成。如果您无法打开付款窗口，请检查您的浏览器设置，看看弹出窗口是否被阻止。成功付款后，积分可能会延迟发放。请等待1-3分钟，点击积分刷新按钮', + Back:'返回', + }, + taskPage:{ + TaskList:'任务列表', + download:'下载', + + }, Habit:{ Workspace:'工作空间', WorkspaceSetting:'设置工作空间', diff --git a/src/lang/en.ts b/src/lang/en.ts index 1c485597..47f4db70 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -17,7 +17,6 @@ export default { Credits:'Credits', TaskList:'Task List', ViewOrders:'View Orders', - jsContent1:'The email format is incorrect', jsContent2:'Succeeded in binding the mailbox.', jsContent3:`You have not performed any operation for a long time. You must be active;otherwise, you will log out in {numTime} S`, @@ -37,7 +36,7 @@ export default { CreditsInformation:'Credits Information', }, exportModel:{ - EditExport:'>Edit & Export', + EditExport:'Edit & Export', CanvasSize:'Canvas Size', Height:'Height', CanvasNav:'Canvas Nav', @@ -46,7 +45,7 @@ export default { Size:'Size', Brushwork:'Brushwork', Texture:'Texture', - FillBack:'FillBack', + FillBack:'Fill & Border', Layer:'Layer', More:'More', insufficient:'Your points balance is insufficient, if you need to use this feature, please click the top left corner to recharge', @@ -56,6 +55,8 @@ export default { requiresCredits:'Each picture requires 300 credits', Scale:'Scale', Cancel:'Cancel', + jsContent1:'Canvas edit content is not saved, whether to leave the page', + }, upgradePlan:{ BuyCredlts:'Buy credlts', diff --git a/src/views/HomeMain.vue b/src/views/HomeMain.vue index b1cabe85..67c95006 100644 --- a/src/views/HomeMain.vue +++ b/src/views/HomeMain.vue @@ -194,8 +194,8 @@ export default defineComponent({ this.getLang('') }, methods: { - setTask(){ - this.openTask() + setTask(data){ + this.openTask(data) }, turnToNewPage(url) { window.open(url); @@ -366,9 +366,9 @@ export default defineComponent({ setLocale(v){ this.setLang(v) }, - openTask(){ + openTask(data){ let taskPage = this.$refs.TaskPage - taskPage.init() + taskPage.init(data) }, }, }); diff --git a/src/views/HomeView/HomeView.vue b/src/views/HomeView/HomeView.vue index 95f733bd..60a18bc1 100644 --- a/src/views/HomeView/HomeView.vue +++ b/src/views/HomeView/HomeView.vue @@ -1046,8 +1046,8 @@ export default defineComponent({ }); } }, - setTask(){ - this.$emit('setTask') + setTask(data:any){ + this.$emit('setTask',data) // this.exportModel() }, },