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

Merge branch 'develop' into StableVersion

Browse Source
This commit is contained in:
WangXiaoDong
2024-05-18 08:05:44 +08:00
parent e34289e15d 3961638804
commit e4d6bb4f7e
5 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.env.dev
View File

@@ -1,8 +1,8 @@
NODE_ENV = 'development'
# VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk'
# VUE_APP_BASE_URL = 'https://api.aida.com.hk'
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'

2
.env.dev_build
View File

@@ -3,5 +3,5 @@ NODE_ENV = 'production'
# VUE_APP_BASE_URL = 'http://18.167.251.121:10088'
# VUE_APP_BASE_URL = 'https://api.aida.com.hk'
VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk'
# VUE_APP_BASE_URL = 'https://api.aida.com.hk'

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

@@ -152,13 +152,13 @@ export default defineComponent({
init(data:any){
this.visible = true
// this.getTaskList()
this.isShowMark = true
let time = 0
let time = 100
if(data){
time = 1000
}
setTimeout(() => {
this.currentPage = 1
this.isShowMark = true
this.getTaskMoreList()
this.getTaskTime = null
}, time);
@@ -236,11 +236,11 @@ export default defineComponent({
}
Https.axiosPost(Https.httpUrls.getTasksHistory,data).then((rv)=>{
this.isShowMark = false
this.currentPage += 1
if(this.currentPage > 1 && rv.content.length == 0){
if(this.currentPage != 1 && rv.content.length == 0){
this.currentPage = 1
this.getTaskMoreList()
}else{
this.currentPage += 1
this.taskListMore.push(...rv.content)
this.total = rv.total
this.taskListUnfinished = []

10
src/views/HomeView/HomeView.vue
View File

@@ -441,7 +441,6 @@ export default defineComponent({
let noRefresh = this.$route.params.noRefresh; //判断是否主动刷新还是路由跳转过来的 true 路由跳转过来的
window.addEventListener('beforeunload', (event)=>{
this.store.commit("setUserGroupId", this.$route.params.id);
this.store.commit("clearAllCollection");
});
if (this.$route.name == "homePage") {
@@ -516,8 +515,10 @@ export default defineComponent({
this.isMannequinShow = false
let num = 0
this.allBoardData?.sketchboardFiles?.forEach((sketchItem:any) => {
this.workspacePosition.forEach((positionItem:any) => {
if(positionItem.name == sketchItem.category){
if(positionItem.value == sketchItem.category){
num ++
// console.log(num,this.allBoardData?.sketchboardFiles.length);
}
@@ -632,6 +633,7 @@ export default defineComponent({
"setDesignCollectionList",
rv.designCollectionItems
);
this.store.commit("setLikeDesignCollectionList", []);
this.store.commit("deleteUserGroupId");
this.store.commit(
@@ -641,7 +643,6 @@ export default defineComponent({
this.store.commit("setDesignId", rv.designId);
// this.designProgress = 0;
this.startDesignType = "design";
}
})
.catch((res) => {
@@ -676,6 +677,7 @@ export default defineComponent({
);
// this.designProgress = 0,
this.startDesignType = "resDesign";
this.store.commit("setDesignId", rv.designId);
}
})
.catch((res) => {
@@ -825,6 +827,7 @@ export default defineComponent({
if (this.likeLoading) {
return;
}
this.likeLoading = true;
Https.axiosPost(Https.httpUrls.designLike, data)
.then((rv: any) => {
@@ -888,6 +891,7 @@ export default defineComponent({
Https.httpUrls.historyChoose + `?userGroupId=${userGroupId}`;
Https.axiosGet(url)
.then((rv: any) => {
this.store.commit("setUserGroupId", rv.userGroupId);
this.dealHistoryChooseData(rv, type);
this.isShowMark = false;
})

2
src/views/LoginPage.vue
View File

@@ -527,6 +527,8 @@ export default defineComponent({
// this.$router.push("/home");
// console.log(window.location.search.substring(1));
this.store.commit("clearAllData");
this.store.commit("clearAllCollection");
this.store.commit("setAllBoardDataChoose",{});
this.$router.push("/home");
},
//获取当前语言