Merge branch 'blueBranch' into allTestUrgent

# Conflicts:
#	src/views/login/login.vue

src/HManagement/serviceDataScreen/index.vue

@@ -514,12 +514,9 @@ export default {
       this.dialogVisible = true
     },
     handleBeforeunload(){
-      setTimeout(()=>{
-        console.log('退出全屏刷新页面******')
-        this.$refs.fullRef.backFullscreen()
-        // this.$router.push('/message')
-      },1000)
-
+      console.log('退出全屏刷新页面******')
+      sessionStorage.setItem('isFull','0')
+      this.$refs.fullRef.backFullscreen()
     }
   },
   created() {

src/store/index.js

@@ -103,7 +103,7 @@ export default new Vuex.Store({
       state.sys_modules = data
     },
     setAppMenu (state,data) {
-      if (window.location.hash.substring(1) === '/serviceDataScreen'){
+      if (window.location.hash.substring(1) === '/serviceDataScreen'  && sessionStorage.getItem('isFull') != 1){
         router.push('/message')
       }else {
         state.menuApp = data

src/views/login/login.vue

@@ -329,6 +329,7 @@ export default {
               sessionStorage.getItem("active_account")
             ).siteid;
             if ((usertype == 1 || usertype == 0) && (siteid == "HY" || siteid == "YOSTEST1")) {
+              sessionStorage.setItem('isFull','1')
               this.$router.push("/serviceDataScreen");
             } else {
               this.$router.push({ path: "/main" });
@@ -355,6 +356,7 @@ export default {
         id: 10026401,
       });
       this.langusge = res.data;
+      console.log("langusge", this.langusge);
       this.nowType =
         localStorage.getItem("lang") && localStorage.getItem("lang") !== null
           ? localStorage.getItem("lang")