Merge branch 'dev_vite' of ssh://18.167.251.121:10002/aidlab/aida_front into dev_vite

src/store/index.ts

@@ -13,7 +13,8 @@ export interface RootState{
 
 export default createStore<RootState>({
   state: {
-	loading: true,
+	loading: false,
+	dataLoading: true,
 	view_loading: false,
   },
   getters: {
@@ -25,6 +26,9 @@ export default createStore<RootState>({
 	set_view_loading(state, v){
 		state.view_loading = v;
 	},
+	set_dataLoading(state, v){
+		state.dataLoading = v;
+	},
   },
   actions: {
   },

src/views/HomeMain.vue

@@ -427,7 +427,7 @@
           <div class="userSystem" v-show="pastDuePage">
             {{ $t('Header.pastDue') }}
           </div>
-          <div class="router" v-if="!loading">
+          <div class="router" v-if="!dataLoading">
             <home
               ref="home"
               @setNewProject="() => (leftShow = true)"
@@ -443,9 +443,9 @@
     <UpgradePlan ref="UpgradePlan"></UpgradePlan>
     <TaskPage ref="TaskPage"></TaskPage>
 
-    <!-- <div class="mark_loading" v-show="loading">
+    <div class="mark_loading" v-show="dataLoading">
       <a-spin size="large" />
-    </div> -->
+    </div>
     <!-- <RobotAssist v-if="!loading"></RobotAssist> -->
     <scaleVideo ref="scaleVideo"></scaleVideo>
     <!-- 进行续订 -->
@@ -661,7 +661,7 @@ export default defineComponent({
     })
 
     let activeCredits = ref(false)
-    let loading = computed(() => (store.state.loading))
+    let dataLoading = computed(() => (store.state.dataLoading))
     let messageNum = computed(() => {
       return store.state.UserHabit.messageSystem.messageNum
     })
@@ -1075,7 +1075,7 @@ export default defineComponent({
       isMurmur,
       credits,
       activeCredits,
-      loading,
+      dataLoading,
       messageNum,
       messageType,
       ...toRefs(stateList),
@@ -1133,11 +1133,11 @@ export default defineComponent({
       this.store
         .dispatch('getLangType')
         .then(() => {
-          this.store.commit('set_loading', false)
+          this.store.commit('set_dataLoading', false)
           resolve()
         })
         .catch(() => {
-          this.store.commit('set_loading', false)
+          this.store.commit('set_dataLoading', false)
           reject()
         })
     })
@@ -1339,7 +1339,7 @@ export default defineComponent({
       })
     },
     setLang(v) {
-      this.store.commit('set_loading', true)
+      this.store.commit('set_dataLoading', true)
       Https.axiosGet(Https.httpUrls.changeUserLanguage, { params: { language: v } })
         .then(rv => {
           if (rv) {
@@ -1356,11 +1356,11 @@ export default defineComponent({
               window.location.reload()
               // window.location.href = '/home';
             }
-            this.store.commit('set_loading', false)
+            this.store.commit('set_dataLoading', false)
           }
         })
         .catch(() => {
-          this.store.commit('set_loading', false)
+          this.store.commit('set_dataLoading', false)
         })
     },