代码调整

src/views/login/normalLogin.vue

@@ -203,9 +203,18 @@ export default {
                 if (orgList.length < 2) {
                     if (orgList.length === 1) {
                         orgId = orgList[0].orgId;
-                        selectOrgnization(orgId);
+                        selectOrgnization(orgId).then(() => { // 先登入组织，再跳转路由（跳转路由会获取用户信息，可能拿不到组织信息）
+                            this.handleLoginSucessRoute();
+                        }).catch(err => {
+                            this.loading = false;
+                            this.tipsMsg = `登入组织失败！，${err.message}`;
+                            setTimeout(() => {
+                                this.tipsMsg = '';
+                            }, 5000);
+                        });
+                    } else {
+                        this.handleLoginSucessRoute();
                     }
-                    this.handleLoginSucessRoute();
                 } else {
                     this.$emit('showOrgList', orgList);
                 }
@@ -216,8 +225,17 @@ export default {
         },
         // 选择组织
         selectOrg(orgId) {
-            this.handleLoginSucessRoute();
-            selectOrgnization(orgId);
+            // this.handleLoginSucessRoute();
+            // selectOrgnization(orgId);
+            selectOrgnization(orgId).then(() => { // 先登入组织，再跳转路由（跳转路由会获取用户信息，可能拿不到组织信息）
+                this.handleLoginSucessRoute();
+            }).catch(err => {
+                this.loading = false;
+                this.tipsMsg = `登入组织失败！，${err.message}`;
+                setTimeout(() => {
+                    this.tipsMsg = '';
+                }, 5000);
+            });
         },
         // 跳转路由
         handleLoginSucessRoute() {

src/views/newMap/display/terminals/equipmentConstructionTable.vue

@@ -251,7 +251,7 @@ export default {
     }
 };
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .equipmentConstructionTable{
   width:91%;margin-left:15px
 }

src/views/publish/examRule/draft/index.vue

@@ -133,6 +133,8 @@ export default {
                     console.log(uploadData);
                     console.log(resp);
                 }
+            }).catch(err => {
+                this.$message.error(err.message);
             });
         },
         turnback() {