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

Merge remote-tracking branch 'origin/StableVersion' into develop

Browse Source
This commit is contained in:
X1627315083
2024-09-03 16:50:16 +08:00
parent 6320e84c95 1a8af7b0b4
commit f3ac5ab136
14 changed files with 190 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -336,7 +336,8 @@ export default defineComponent({
let allBoardData:any = computed(()=>{
return store.state.UploadFilesModule.allBoardData})
let isMannequinShow = ref(false)
let chooseIsDesign:any = ref(1)
let chooseIsDesign:any = computed(()=>{
return store.state.UploadFilesModule.chooseIsDesign})
return {
store,
likeDesignCollectionList,
@@ -473,7 +474,6 @@ export default defineComponent({
// this.store.commit("clearAllCollection");
}
if (this.$route.params.id) {
this.chooseIsDesign = this.$route.params.isDesign
if(this.$route.params.type == 'History'){
this.getHistoryChoose(this.$route.params.id, "normal");
}else if(this.$route.params.type == 'Works'){
@@ -607,7 +607,6 @@ export default defineComponent({
_this.store.commit("clearAllCollection");
_this.store.commit("setAllBoardDataChoose",{});
_this.store.commit("clearShowSketchboard",{});
_this.chooseIsDesign = 1;
_this.isHaveReviewCollection = false
}
});
@@ -667,7 +666,7 @@ export default defineComponent({
//设计新的collection
designNewCollection() {
if(this.chooseIsDesign == 0){
if(!this.chooseIsDesign.value){
message.info(this.t('HomeView.jsContent10'));
return
}

8
src/views/HomeView/history.vue
View File

@@ -349,11 +349,13 @@ export default defineComponent({
},
retrieveHome(record:any){
let num = 1
let num = true
if(record.original == 0){
num = 0
num = false
}
this.$router.push({name:'homePage',params: {id:record.id,type:'History',isDesign:num}})
this.$router.push({name:'homePage',params: {id:record.id,type:'History'}})
this.store.commit('setChooseIsDesign',num)
},
removeLabel(){
let setLabel:any = this.$refs.setLabel

4
src/views/Upgrade.vue
View File

@@ -8,10 +8,10 @@
<div class="upgrade-content-text">System upgrading</div>
<!-- <div class="upgrade-content-text">System maintenance</div> -->
<!-- 没有截至时间 -->
<div class="upgrade-content-textab">Due to system server upgrades, We will be upgrading from 9:30 am Hong Kong time on Tuesday, July 9 until further notice. During this period, access to the AiDA system will be temporarily unavailable.<br> We apologize for any inconvenience this may cause and appreciate your understanding.</div>
<!-- <div class="upgrade-content-textab">Due to system server upgrades, We will be upgrading from 9:30 am Hong Kong time on Tuesday, July 9 until further notice. During this period, access to the AiDA system will be temporarily unavailable.<br> We apologize for any inconvenience this may cause and appreciate your understanding.</div> -->
<!-- 有截至时间 -->
<!-- <div class="upgrade-content-textab">Due to system server upgrades, We will be upgrading from 9:30 am Hong Kong time on Tuesday, July 9 until 17:00 PM on Tuesday, July 9. During this period, access to the AiDA system will be temporarily unavailable.<br> We apologize for any inconvenience this may cause and appreciate your understanding.</div> -->
<!-- <div class="upgrade-content-textab">The AiDA system cannot be accessed temporarily due to system server maintenance. We apologize for any inconvenience this may cause and thank you for your understanding.</div> -->
<div class="upgrade-content-textab">The AiDA system cannot be accessed temporarily due to system server maintenance. We apologize for any inconvenience this may cause and thank you for your understanding.</div>
</div>
</div>
</template>