From 085349ae8b5be2c0bdbaed7fa4f7f3f6602ac0b0 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Fri, 26 Jan 2024 14:43:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.test | 2 ++ src/component/HomePage/PrintboardUpload.vue | 3 +-- src/component/HomePage/SketchboardUpload.vue | 8 +++--- src/lang/cn.ts | 10 ++++---- src/tool/https.js | 19 ++++++++------ src/views/OldHistoryPage.vue | 26 ++++++++++++++++---- vue.config.js | 8 +++--- 7 files changed, 48 insertions(+), 28 deletions(-) diff --git a/.env.test b/.env.test index d3167871..c6531b40 100644 --- a/.env.test +++ b/.env.test @@ -1,5 +1,7 @@ NODE_ENV = 'development' VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk' +# VUE_APP_BASE_URL = 'https://polyu.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' diff --git a/src/component/HomePage/PrintboardUpload.vue b/src/component/HomePage/PrintboardUpload.vue index 10563fce..95d94f0b 100644 --- a/src/component/HomePage/PrintboardUpload.vue +++ b/src/component/HomePage/PrintboardUpload.vue @@ -104,8 +104,7 @@
-
{{ $t('PrintboardUpload.Generate') }}
-
{{ $t('PrintboardUpload.Close') }}
+
{{ $t('PrintboardUpload.Generate') }}
{{ $t('PrintboardUpload.maximumLength') }}
diff --git a/src/component/HomePage/SketchboardUpload.vue b/src/component/HomePage/SketchboardUpload.vue index b720191b..2d6ac337 100644 --- a/src/component/HomePage/SketchboardUpload.vue +++ b/src/component/HomePage/SketchboardUpload.vue @@ -180,8 +180,7 @@
-
{{ $t('SketchboardUpload.Generate') }}
-
{{ $t('SketchboardUpload.Close') }}
+
{{ $t('SketchboardUpload.Generate') }}
{{ $t('SketchboardUpload.maximumLength') }}
@@ -249,7 +248,7 @@
-
+
{{$t('Generate.Sequence')}}: {{ generateLineUp }}
@@ -257,6 +256,7 @@
{{$t('Generate.Close')}}
+
@@ -810,7 +810,7 @@ export default defineComponent({ id:v.generateItemId, imgUrl:v.generateItemUrl, category:generage.level2Type?generage.level2Type:sketchCatecoryList[0].name, - categoryValue:categoryValue, + categoryValue:categoryValue?categoryValue:sketchCatecoryList[0].value, id_:GO.id++, like:v.isLiked } diff --git a/src/lang/cn.ts b/src/lang/cn.ts index 8701b1aa..1fe2858f 100644 --- a/src/lang/cn.ts +++ b/src/lang/cn.ts @@ -178,7 +178,7 @@ export default { currently:'您排在队列中的第{generateLineUp}位', PIN:'PIN', Maximum:'最多可上传{maxImg}张图片，每张图片最大2M', - Thumbnail:'选择的服装缩略图', + Thumbnail:'选择的线稿缩略图', inputContent1:'生成图片的标题', maximumLength:'输入的内容超过允许输入的最大长度', jsContent1:"上传失败", @@ -290,10 +290,10 @@ export default { Printboard:'印花板', Colorboard:'颜色板', Sketchboard:'服装板块', - MoodCollection:'选择需要收藏的情绪板', - PrinCollection:'选择需要收藏的印花板', - ColorCollection:'选择需要收藏的颜色板', - SketchCollection:'选择需要收藏的服装板', + MoodCollection:'为您的系列选择情绪版', + PrinCollection:'为您的系列选择印花版', + ColorCollection:'为您的系列选择颜色版', + SketchCollection:'为您的系列选择线稿版', jsContent1:'因为您选择了多张图片，请点击布局后继续.', jsContent2:'上传的文件不会保存，是否继续? ', jsContent3:'您必须选择一种或多种颜色进行下一步。', diff --git a/src/tool/https.js b/src/tool/https.js index 94689480..824d8139 100644 --- a/src/tool/https.js +++ b/src/tool/https.js @@ -25,10 +25,12 @@ import { message } from 'ant-design-vue'; // }else{ // httpIp = '' // } -let httpIp = process.env.NODE_ENV == 'development' ? "" : ""; -// let httpIp = process.env.NODE_ENV == 'development' ? "http://192.168.1.10:10086" : ""; -console.log(httpIp); +// let httpIp = process.env.NODE_ENV == 'development' ? "" : ""; +let httpIp = process.env.NODE_ENV == 'development' ? "http://192.168.1.7/:10086" : ""; +// console.log(httpIp,process.env.VUE_APP_BASE_URL); + axios.defaults.baseURL = process.env.VUE_APP_BASE_URL; //配置接口地址 + // console.log(process.env.VUE_APP_BASE_URL); //POST传参序列化(添加请求拦截器) axios.interceptors.request.use((config) => { @@ -164,14 +166,14 @@ export const Https = { pictureLikeOrUnLike:`/api/python/pictureLikeOrUnLike`,//机器人生成图喜欢 getBloodBars:`/api/python/getBloodBars`,//机器人血条 - workspaceDetail:`${httpIp}/api/workspace/detail`,//用户习惯详情 + workspaceDetail:`/api/workspace/detail`,//用户习惯详情 workspaceenumValues:`/api/workspace/enumValues`,//getSex - workspaceRemove:`${httpIp}/api/workspace/remove`,//删除用户习惯详情 - workspacesaveOrUpdate:`${httpIp}/api/workspace/saveOrUpdate`,//修改用户习惯详情 - getMannequins:`${httpIp}/api/workspace/getMannequins`,//模特 + workspaceRemove:`/api/workspace/remove`,//删除用户习惯详情 + workspacesaveOrUpdate:`/api/workspace/saveOrUpdate`,//修改用户习惯详情 + getMannequins:`/api/workspace/getMannequins`,//模特 - workspaceList:`${httpIp}/api/workspace/list`, + workspaceList:`/api/workspace/list`, sketchAndPrintGenerate:'/api/generate/sketchAndPrint',//sketchGenerate生成图片 generatePrepare:'/api/generate/prepare',//开始生成generate图片 @@ -180,6 +182,7 @@ export const Https = { generateLike:'/api/generate/like',//喜欢ganerate图片 generateDislike:'/api/generate/dislike',//喜欢ganerate图片 elementUpload:`/api/element/upload`,//上传图片 + // oldHis:`/oldHis/history/queryUserGroup`,//上传图片 sketchBoardsBoundingBox:`/api/design/sketchBoardsBoundingBox`,//裁剪sketch图片 trialOrderList:`/api/account/trialOrderList`,//获取审批列表 diff --git a/src/views/OldHistoryPage.vue b/src/views/OldHistoryPage.vue index 821c3538..8048d0ea 100644 --- a/src/views/OldHistoryPage.vue +++ b/src/views/OldHistoryPage.vue @@ -35,7 +35,7 @@
{{ $t('HistoryPage.Detail') }}
-
{{ $t('HomeView.Export') }}
+
{{ $t('HomeView.Export') }}
{{ $t('HistoryPage.Delete') }}
@@ -79,6 +79,7 @@ import JSZip, { forEach } from "jszip"; import html2canvas from "html2canvas"; import { useStore } from "vuex"; import { useI18n } from 'vue-i18n'; +import { getCookie } from "@/tool/cookie"; const FileSaver = require("file-saver"); export default defineComponent({ components: { @@ -111,6 +112,7 @@ export default defineComponent({ }); let collectionList:any = ref([]) let {t} = useI18n() + let userInfo:any = ref() return { rangePickerValue, columns, @@ -118,6 +120,7 @@ export default defineComponent({ renameData, t, store, + userInfo, } }, data(){ @@ -135,6 +138,8 @@ export default defineComponent({ } }, mounted(){ + let userInfo:any = getCookie("userInfo") + this.userInfo = JSON.parse(userInfo); let historyTable:any = this.$refs.historyTable this.historyTableHeight = historyTable.clientHeight - 130 this.getHistoryList() @@ -169,10 +174,13 @@ export default defineComponent({ size:this.pageSize, collectionName:this.searchCollectionName, startDate:startDate, - endDate:endDate + endDate:endDate, + userId:83, } - Https.axiosPost( Https.httpUrls.queryUserGroup, data).then( + Https.axiosPost('http://192.168.1.9:5566/api/history/queryUserGroup', data).then( (rv: any) => { + console.log(rv); + this.collectionList = rv.content this.total = rv.total } @@ -232,7 +240,16 @@ export default defineComponent({ // } // ); // }, - exportCanvas(){ + exportCanvas(recold:any){ + console.log(recold); + return + let url = Https.httpUrls.historyChoose + `?userGroupId=${recold.id}` + Https.axiosGet(url).then( + (rv: any) => { + // this.dealHistoryChooseData(rv,type) + } + ).catch(rv=>{ + }); let collectionReview:any = document.querySelector("#exportNewCoolection") let a = document.createElement('a'); this.isShowMark = true @@ -264,7 +281,6 @@ export default defineComponent({ // a.setAttribute('href', URL.createObjectURL(blob)); // a.setAttribute('download', `collection.png`); // a.click(); - }) }, downImg(imagesParams:any) { diff --git a/vue.config.js b/vue.config.js index 228dc125..7ba0466b 100644 --- a/vue.config.js +++ b/vue.config.js @@ -19,7 +19,7 @@ module.exports = defineConfig({ // changeOrigin: true, //是否允许跨越 // } '/api':{ - target:'http://192.168.1.7:5567', + target:'https://develop.api.aida.com.hk', changeOrigin:true, }, '/robot':{ @@ -29,11 +29,11 @@ module.exports = defineConfig({ '^/robot': 'api', // api替换成api } }, - '/xuPei':{ - target:'http://192.168.1.10:5567', + '/oldsis':{ + target:'http://192.168.1.9:5566', changeOrigin:true, pathRewrite:{ - '^/xuPei': 'api', // api替换成api + '^/oldsis': 'api', // api替换成api } } },