qymljy 1 anno fa
parent
commit
87f9a0939f

+ 1 - 1
src/components/newLayout/modules/header.vue

@@ -39,7 +39,7 @@
       </el-dropdown-menu>
     </el-dropdown>-->
       <!--    <el-divider direction="vertical"></el-divider>-->
-<!--      <el-button size="mint" type="primary"  style="background-color:rgb(52 106 145);margin-right: 20px;color: #FFFFFF" v-if="usertype == 1 || usertype == 0" @click="$router.push('/serviceDataScreen')">{{$t(`业务数据大屏`)}}</el-button>-->
+      <el-button size="mint" type="primary"  style="background-color:rgb(52 106 145);margin-right: 20px;color: #FFFFFF" v-if="usertype == 1 || usertype == 0" @click="$router.push('/serviceDataScreen')">{{$t(`业务数据大屏`)}}</el-button>
       <svg
         t="1725853431060"
         class="icon"

+ 6 - 7
src/views/login/login.vue

@@ -317,13 +317,12 @@ export default {
           sessionStorage.setItem("active_password", res.remindchangepassword);
           this.basicData.query_userauth().then(() => {
             this.basicData.querySite_Parameter();
-            // let usertype = JSON.parse(sessionStorage.getItem('active_account')).usertype
-            // if (usertype == 1 || usertype == 0){
-            //   this.$router.push('/serviceDataScreen')
-            // }else {
-            //   this.$router.push({ path: "/main" });
-            // }
-            this.$router.push({ path: "/main" });
+            let usertype = JSON.parse(sessionStorage.getItem('active_account')).usertype
+            if (usertype == 1 || usertype == 0){
+              this.$router.push('/serviceDataScreen')
+            }else {
+              this.$router.push({ path: "/main" });
+            }
             this.getAccountInfo();
           });
         } else {