aidlab/aida_front
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
X1627315083
2024-01-05 14:12:03 +08:00
parent 6abd6816d9
commit 184b95239a
22 changed files with 267 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.env.test
View File

@@ -1,4 +1,4 @@
NODE_ENV = 'development'
# VUE_APP_BASE_URL = 'https://develop.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 = 'http://18.167.251.121:10086'
# VUE_APP_BASE_URL = 'http://192.168.1.6:5567'

5
src/assets/style/style.css
View File

@@ -130,16 +130,17 @@ li {
--el-color-primary: #d9d9d9;
--el-cascader-tag-background: #e1d9ec;
--el-fill-color: #e1d9ec;
height: 80%;
height: 100%;
width: 90% !important;
flex-wrap: nowrap;
overflow: hidden;
align-items: center;
}
.el-cascader__tags .el-tag--light,
.el-cascader__collapse-tag .el-tag--light {
margin: 0 0 0 0.6rem;
padding-right: 0.5rem;
height: 100%;
height: 80%;
--el-icon-size: 1.4rem;
display: flex;
}

5
src/assets/style/style.less
View File

@@ -144,14 +144,15 @@ ul,li{
--el-color-primary: #d9d9d9;
--el-cascader-tag-background:#e1d9ec;
--el-fill-color:#e1d9ec;
height: 80%;
height: 100%;
width: 90% !important;
flex-wrap: nowrap;
overflow: hidden;
align-items: center;
.el-tag--light{
margin: 0 0 0 .6rem;
padding-right: .5rem;
height: 100%;
height: 80%;
--el-icon-size: 1.4rem;
display: flex;
.el-tag__content{

2
src/component/Detail/DesignDetailAlter.vue
View File

@@ -674,7 +674,7 @@ export default defineComponent({
},
setSketchLibrary(item){
let data = {
libraryId:item.id,
libraryId:[item.id],
level2Type:item.level2Type,
}
Https.axiosPost(Https.httpUrls.setSketchLibrary,data).then(

2
src/component/HomePage/Material.vue
View File

@@ -358,7 +358,7 @@ export default defineComponent({
},
setSketchLibrary(item:any){
let data = {
libraryId:item.id,
libraryId:[item.id],
level2Type:item.category,
}
Https.axiosPost(Https.httpUrls.setSketchLibrary,data).then(

1
src/lang/cn.ts
View File

@@ -78,6 +78,7 @@ export default {
Model2:'插画画风',
Model3:'真实画风',
Name:'名字:',
Category:'类别:',
inputContent3:'输入生成图片的标题',
Cancel:'取消',
Sure:'保存',

1
src/lang/en.ts
View File

@@ -78,6 +78,7 @@ export default {
Model2:'Illustration Style',
Model3:'Real Style',
Name:'Name:',
Category:'Category:',
inputContent3:'Enter a new name',
Cancel:'Cancel',
Sure:'Submit',

1
src/lang/fr.ts
View File

@@ -79,6 +79,7 @@ export default {
Model2:"Style d'illustration",
Model3:'Style réel',
Name:'Nom:',
Category:'Catégorie:',
inputContent3:'Saisie rapide',
Cancel:'Annuler',
Sure:'Soumettre',

1
src/lang/it.ts
View File

@@ -78,6 +78,7 @@ export default {
Model2:'Stile di illustrazione',
Model3:'Stile reale',
Name:'Nome:',
Category:'Categoria:',
inputContent3:'Immissione rapida',
Cancel:'Annulla',
Sure:'Invia',

1
src/lang/ja.ts
View File

@@ -78,6 +78,7 @@ export default {
Model2:'イラストのスタイル',
Model3:'リアルなスタイル',
Name:'名前:',
Category:'カテゴリー:',
inputContent3:'プロンプト入力',
Cancel:'キャンセル',
Sure:'提出す',

1
src/lang/kr.ts
View File

@@ -78,6 +78,7 @@ export default {
Model2:'일러스트 스타일',
Model3:'리얼 스타일',
Name:'이름:',
Category:'카테고리:',
inputContent3:'프롬프트 입력',
Cancel:'취소',
Sure:'제출하다',

1
src/lang/ru.ts
View File

@@ -78,6 +78,7 @@ export default {
Model2:'Стиль иллюстрации',
Model3:'Реалистический стиль',
Name:'Имя:',
Category:'категория :',
inputContent3:'Быстрый ввод',
Cancel:'Отмена',
Sure:'Запись',

1
src/lang/th.ts
View File

@@ -78,6 +78,7 @@ export default {
Model2:'สไตล์การวาดภาพประกอบ',
Model3:'สไตล์แบบจริง',
Name:'ชื่อ:',
Category:'หมวดหมู่:',
inputContent3:'ป้อนข้อมูลทันที',
Cancel:'ยกเลิก',
Sure:'บันทึก',

1
src/lang/vn.ts
View File

@@ -78,6 +78,7 @@ export default {
Model2:'Phong cách minh họa',
Model3:'Phong cách thực tế',
Name:'Tên:',
Category:'Danh mục:',
inputContent3:'Nhập liệu nhanh chóng',
Cancel:'Hủy bỏ',
Sure:'Nộp',

93
src/router/index.ts
View File

@@ -1,49 +1,62 @@
import { createRouter, createWebHistory, RouteRecordRaw, createWebHashHistory } from 'vue-router'
import { defineAsyncComponent } from 'vue'
const _import = (path : string) => defineAsyncComponent(() => import(`../views/${path}.vue`));
const _import = (path: string) => defineAsyncComponent(() => import(`../views/${path}.vue`));
const routes: Array<RouteRecordRaw> = [
{
path: "/",
// redirect重定向
redirect: "/login"
},
{
path: '/login',
name: 'login',
component: _import('LoginPage')
},
{
path: '/home',
name: 'home',
component: _import('HomeView')
},
{
path: '/demo',
name: 'demo',
component: _import('Demo')
},
{
path: '/history',
name: 'history',
component: _import('HistoryPage')
},
{
path: '/library',
name: 'library',
component: _import('LibraryPage')
},
{
path: '/trialApproval',
name: 'trialApproval',
component: _import('trialApproval')
},
{
path: "/",
// redirect重定向
redirect: "/login"
// redirect: "/Upgrade"
},
{
path: '/login',
name: 'login',
component: _import('LoginPage')
},
{
path: '/upgrade',
name: 'upgrade',
component: _import('Upgrade'),
},
{
path: '/home',
name: 'home',
component: _import('HomeView')
},
{
path: '/demo',
name: 'demo',
component: _import('Demo')
},
{
path: '/history',
name: 'history',
component: _import('HistoryPage')
},
{
path: '/library',
name: 'library',
component: _import('LibraryPage')
},
{
path: '/trialApproval',
name: 'trialApproval',
component: _import('trialApproval')
},
]
const router = createRouter({
history: createWebHistory(process.env.BASE_URL),
// history: createWebHashHistory(),
routes
history: createWebHistory(process.env.BASE_URL),
// history: createWebHashHistory(),
routes
})
// router.beforeEach((to, from, next) => {
// const toName = to.name === 'upgrade';
// if (toName) {
// next();
// } else {
// next({ name: 'upgrade' });
// }
// });
export default router

3
src/tool/guide.js
View File

@@ -210,12 +210,13 @@ function removeDiv(element){
}
const openGuide = () =>{
let isTest = JSON.parse(getCookie('isTest'))
let isBeginner = JSON.parse(getCookie('isBeginner'))
// console.log(isBeginner);
let isBeginnerNum = JSON.parse(getCookie('isBeginnerNum')?getCookie('isBeginnerNum'):'0')
let data
// console.log(isBeginner);
if(isBeginner){
if(isBeginner && isTest){
if(isBeginnerNum){
driverObj__.drive(isBeginnerNum);
}else{

3
src/tool/https.js
View File

@@ -100,7 +100,10 @@ export const Https = {
trialUserLogout:`/account/trialUserLogout`, //试用用户退出登录接口
completeGuidancet:`/api/account/completeGuidance`, //用户指引结束
getExpiredTime:`/api/account/getExpiredTime`, //获取用户到期事件
preLogin:'/api/account/preLogin',//预先登入
accountSendEmail:`/api/account/sendEmail`, //发送邮件
accountResetPwd:'/api/account/resetPwd', //忘记密码修改

23
src/views/HomeView.vue
View File

@@ -365,7 +365,7 @@ export default defineComponent({
},
},
},
mounted() {
async mounted() {
// if(JSON.parse( getCookie('isFirst') as any)){
openGuide()
// }
@@ -373,7 +373,28 @@ export default defineComponent({
let userInfo:any = getCookie("userInfo")
this.userInfo = JSON.parse(userInfo);
this.store.dispatch('get_clothingType')
//判断账号剩余时间是否太短
// await new Promise(async (resolve) => {
// await Https.axiosPost(Https.httpUrls.getExpiredTime,{}).then((rv: any) => {
// if (rv) {
// let dateNow = Date.now()
// let date:any = new Date(dateNow)
// let rvDate:any = new Date(rv);
// let diffInMilliseconds = Math.abs(date - rvDate); // 获取时间差的毫秒数
// let days = Math.floor(diffInMilliseconds / (24 * 60 * 60 * 1000)); // 计算天数
// let hours = Math.floor((diffInMilliseconds % (24 * 60 * 60 * 1000)) / (60 * 60 * 1000)); // 计算小时数
// let minutes = Math.floor((diffInMilliseconds % (60 * 60 * 1000)) / (60 * 1000)); // 计算分钟数
// // console.log(`${days}天 ${hours}时 ${minutes}分`);
// // if(30>Number(days)){
// // }
// }else{
// openGuide()
// }
// resolve('')
// })
// })
// console.log(this.store.state.UserHabit);
let noRefresh = this.$route.params.noRefresh; //判断是否主动刷新还是路由跳转过来的 true 路由跳转过来的

88
src/views/LibraryPage.vue
View File

@@ -310,7 +310,7 @@
</div>
<div class="content_img_name"></div>
</div>
<div class="no_data_block" v-show="!imgList.length && !isShowMark">
<div class="no_data_block" v-show="!generateList.length && !isShowMark">
<img src="@/assets/images/homePage/null_img.png">
</div>
</div>
@@ -361,6 +361,37 @@
</div>
</template>
</el-cascader>
<div v-show="selectCode == 'Sketchboard'" class="collection_rename_title">{{$t('LibraryPage.Category')}}</div>
<!-- <div v-show="selectCode == 'Sketchboard'" class="collection_rename_title">{{$t('LibraryPage.Category')}}</div> -->
<div v-show="selectCode == 'Sketchboard'" class="rename_form_content">
<div class="select_block">
<a-select
ref="select"
v-model:value="editSex.value"
:options="sexList"
@change="getPosition"
>
<template #suffixIcon
><span
class="icon iconfont icon-xiala"
style="color: #343579"
></span
></template>
</a-select>
<a-select
ref="select"
v-model:value="editDesignType.value"
:options="disignTypeList"
>
<template #suffixIcon
><span
class="icon iconfont icon-xiala"
style="color: #343579"
></span
></template>
</a-select>
</div>
</div>
<div class="rename_button_list">
<div class="rename_button_item rename_cancel_button" @click="closeRenameModal()">{{ $t('LibraryPage.Cancel') }}</div>
<div class="rename_button_item rename_submit_button" @click="confrimRename()">{{ $t('LibraryPage.Sure') }}</div>
@@ -431,6 +462,12 @@ export default defineComponent({
let disignTypeList:any = [
]
let editSex:any = ref({
value:''
})
let editDesignType:any = ref({
value:''
})
let imgList = ref([])
let currentPage:any = ref(1)
let pageSize:any = ref(18)
@@ -506,6 +543,8 @@ export default defineComponent({
sexList,
sex,
disignTypeList,
editSex,
editDesignType,
designType,
imgList,
currentPage,
@@ -607,6 +646,7 @@ export default defineComponent({
})
});
this.designType = arr[0]
this.editDesignType = arr[0]
this.disignTypeList = arr
// this.workspaceItem.position = this.singleTypeList[0].label
}
@@ -807,7 +847,17 @@ export default defineComponent({
).catch((res)=>{
});
}
let data3 = {
libraryId:this.renameType === 'single' ? [this.selectSingleImg.id] : this.selectImgList,
level2Type:this.editDesignType.value,
}
if(this.selectCode == 'Sketchboard'){
await Https.axiosPost(Https.httpUrls.setSketchLibrary,data3).then(
(rv) => {
}
).catch((res)=>{
});
}
// if(bor){
// }
@@ -819,6 +869,8 @@ export default defineComponent({
//打开修改名称弹窗
showRenameModal(data:any,type:any){
this.newPicName = ''
this.editSex = this.sex
this.editDesignType = this.designType
if(type =='batch' && !this.selectImgList.length){ //批量但未选中
this.newPicName = ''
return
@@ -1577,7 +1629,6 @@ export default defineComponent({
.librart_headr_right{
display: flex;
align-items: center;
.select_block{
// background: #FFFFFF;
color: #1A1A1A !important;
@@ -1906,6 +1957,37 @@ export default defineComponent({
color:#adabb9
}
}
.select_block{
display: flex;
justify-content: space-between;
font-size: 1.8rem;
color:#adabb9;
font-weight: 300;
.ant-select{
border-radius: 4px;
width: 48%;
border: 0.1rem solid #d9d9d9 !important;
.ant-select-arrow{
.icon-xiala{
margin-left: -0rem;
}
}
}
.ant-select-selection-item{
color:#262626;
font-weight: 300;
}
.ant-select-selector{
margin-left: 0rem;
color:#adabb9;
width: 100%;
padding-left: 2.1rem;
}
.icon-xiala{
color: #adabb9 !important;
font-weight: 400;
}
}
}
.rename_button_list{

2
src/views/LoginPage.vue
View File

@@ -470,7 +470,7 @@ export default defineComponent({
setCookie("token", token);
setCookie("isTest", isTest);
setCookie("isBeginner", isBeginner);
setCookie("isBeginnerNum", 0);
setCookie("isBeginnerNum", 0);//从第一步开始，机器人开始的话就是从第二部开始
setCookie("userInfo", JSON.stringify(rv));
this.turnToHomePage();
}

81
src/views/Upgrade.vue Normal file
View File

@@ -0,0 +1,81 @@
<template>
<div class="aida-upgradePage">
<div class="upgrade-content">
<div class="upgrade-content-icon">
<i class="fi fi-rr-settings"></i>
</div>
<div class="upgrade-content-wire"></div>
<div class="upgrade-content-text">System upgrading</div>
</div>
</div>
</template>
<script>
import { defineComponent,h,ref} from "vue";
export default defineComponent({
data(){
return{
}
},
mounted(){
},
methods:{
}
})
</script>
<style scoped lang="less">
.aida-upgradePage{
height: 100vh;
width: 100vw;
position: relative;
--upgradePageColor:#000;
.upgrade-content{
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%,-50%);
.upgrade-content-icon{
overflow: hidden;
margin-top: -50%;
// padding: 0 2rem;
// border-bottom: 1rem solid ;
i{
height: 50%;
transform: translateY(50%);
font-size: 50rem;
display: flex;
animation: rotate 7s infinite linear;
color: var(--upgradePageColor);
@keyframes rotate {
from{
transform: translateY(50%) rotate(0deg);
}
to{
transform: translateY(50%) rotate(360deg);
}
}
}
}
.upgrade-content-wire{
width: 120%;
height: 1rem;
background: var(--upgradePageColor);
position: absolute;
left: 50%;
transform: translateX(-50%);
border-radius: 1rem;
}
.upgrade-content-text{
text-align: center;
margin-top: 2rem;
font-size: 4rem;
font-weight: 600;
}
}
}
</style>

2
vue.config.js
View File

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