Merge branch 'greenUrgent' into allTestUrgent

src/components/newLayout/index.vue

@@ -144,7 +144,7 @@ export default {
   mounted() {
 
     if (JSON.parse(sessionStorage.getItem('active_password')) == '1' && JSON.parse(sessionStorage.getItem('password')) != '1'){
-      if (JSON.parse(sessionStorage.getItem('active_account')).usertype == 0 && JSON.parse(sessionStorage.getItem('active_account')).usertype == 1 && JSON.parse(sessionStorage.getItem('active_account')).siteid == 'HY'){
+      if (JSON.parse(sessionStorage.getItem('active_account')).usertype == 0 && JSON.parse(sessionStorage.getItem('active_account')).usertype == 1 && (JSON.parse(sessionStorage.getItem('active_account')).siteid == 'HY' || JSON.parse(sessionStorage.getItem('active_account')).siteid == 'YOSTEST1')){
         this.dialogVisible = false
       }else {
         this.dialogVisible = true

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) && siteid == 'HY'" @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) && (siteid == 'HY' || siteid == 'YOSTEST1')" @click="$router.push('/serviceDataScreen')">{{$t(`业务数据大屏`)}}</el-button>
       <svg
         t="1725853431060"
         class="icon"

src/views/login/login.vue

@@ -317,7 +317,7 @@ export default {
             this.basicData.querySite_Parameter();
             let usertype = JSON.parse(sessionStorage.getItem('active_account')).usertype
             let siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
-            if ((usertype == 1 || usertype == 0) && siteid == 'HY' ){
+            if ((usertype == 1 || usertype == 0) && (siteid == 'HY' || siteid == 'YOSTEST1') ){
               this.$router.push('/serviceDataScreen')
             }else {
               this.$router.push({ path: "/main" });