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
2024-01-26 14:43:20 +08:00
parent 7ddd99d4a7
commit 085349ae8b
7 changed files with 48 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env.test
View File

@@ -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'

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

@@ -104,8 +104,7 @@
<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 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>
<div class="generage_btn started_btn" @click.stop="getgenerate">{{ $t('PrintboardUpload.Generate') }}</div>
<span>{{ $t('PrintboardUpload.maximumLength') }}</span>
</div>
<div class="modal_img">

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

@@ -180,8 +180,7 @@
<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 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>
<div class="generage_btn started_btn" @click.stop="getgenerate">{{ $t('SketchboardUpload.Generate') }}</div>
<span>{{ $t('SketchboardUpload.maximumLength') }}</span>
</div>
<div class="modal_img">
@@ -249,7 +248,7 @@
</div>
</div>
<div class="mark_loading" v-show="loadingShow && remGenerate">
<div class="mark_loading" v-show="loadingShow">
<a-spin size="large" />
<div class="mark_loading_text" v-show="generateLineUp >= 0">
<div>{{$t('Generate.Sequence')}}: {{ generateLineUp }}</div>
@@ -257,6 +256,7 @@
<div v-show="remGenerate" class="mark_loading_btn" :class="[driver__.driver?'hideEvents':'']" @click="removeGenerate">{{$t('Generate.Close')}}</div>
</div>
</div>
</div>
<scaleImage ref="scaleImage"></scaleImage>
@@ -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
}

10
src/lang/cn.ts
View File

@@ -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:'您必须选择一种或多种颜色进行下一步。',

19
src/tool/https.js
View File

@@ -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`,//获取审批列表

26
src/views/OldHistoryPage.vue
View File

@@ -35,7 +35,7 @@
<div class="operate_list" v-if="column?.Operations">
<div class="operate_item" @click="turnToDetail(record)">{{ $t('HistoryPage.Detail') }}</div>
<!-- <div class="operate_item" @click="renameCollection(record,index)">{{ $t('HistoryPage.Rename') }}</div> -->
<div class="operate_item" @click="exportCanvas()">{{ $t('HomeView.Export') }}</div>
<div class="operate_item" @click="exportCanvas(record)">{{ $t('HomeView.Export') }}</div>
<div class="operate_item" @click="deleteGroup(record, index)">{{ $t('HistoryPage.Delete') }}</div>
</div>
</template>
@@ -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) {

8
vue.config.js
View File

@@ -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
}
}
},