Merge branch 'gn_optimize' into debug

src/main.js

@@ -47,8 +47,6 @@ Vue.mixin(mixins);
 // locale.use(localStorage.getItem('i18n')!='zh' ?  langEN:langZH )
 locale.i18n((key, value) => i18n.t(key, value))
 
-import{endCalc,optionTimeCalc,init}from'@/utils/TimeOnPage.js';
-
 
 import setting from '@/mixins/theme.js'
 Vue.prototype.$setting = setting;
@@ -262,7 +260,6 @@ router.afterEach((to, from, next) => {
 
     if(!stores.state.hasDoPageListening){
       // 初始化需要放在 页面设置标题后，才能拿到正确的标题
-      init()
       stores.mutations.SET_PAGE_EVENT_LISTENER(stores.state,true)
     }
 
@@ -270,9 +267,7 @@ router.afterEach((to, from, next) => {
     if(routerChangeType==='popstate'){
       const IsActive = sessionStorage.getItem('IsActive')
       if(IsActive=='1'){
-        endCalc('popstate',Number(sessionStorage.getItem('popStayTime')||0))
       }
-      optionTimeCalc()
       sessionStorage.removeItem('routerChangeType')
       sessionStorage.removeItem('popStayTime')
     }

src/views/Home.vue

@@ -419,7 +419,6 @@ import questionMsgDia from "@/components/questionMsgDia.vue";
 import questionnaireDia from "../components/questionnaireDia.vue";
 import EventBus from "@/api/bus.js";
 import storage from '@/utils/storage'
-import { recordActiveLoginFun, loginEndCalc } from "@/utils/TimeOnPage.js"
 import NotificationMsg from "../components/notificationMsg.vue";
 export default {
   components: {
@@ -928,12 +927,6 @@ export default {
       this.$confirm(/* "确认退出吗?" */this.$t('MsgPrompt.confirm_logout_msg'), this.$t('Dialog.warn_tit'), {
         type: "warning",
       }).then(() => {
-        if (this.isTrail) {
-          // 结算活跃计时
-          loginEndCalc()
-          // 结算登录计时
-          recordActiveLoginFun()
-        }
 
         userLogOut().then(res => { })
           .finally(() => {

src/views/Login.vue

@@ -508,10 +508,7 @@ export default {
             localStorage.setItem("AdminName", res.Data.AdminName);
             localStorage.setItem("loginTime",new Date())
             storage.setCookie('ai_token',res.Data.AdminName)
-            // 清除最近登录时长
-            recordActiveLogin({ActiveTime:0}).then(res=>{
-                if(res.Ret!==200) return
-            })
+
         },
         //根据角色判断应该进入系统的哪个页面，进入系统
         async loginSys(res){

src/vuex/modules/permissionButton.js

@@ -1,5 +1,4 @@
 import {departInterence} from '@/api/api.js';
-import{doPageEventListener}from'@/utils/TimeOnPage.js';
 
 // 权限配置按钮
 const permissionButtons = {
@@ -24,7 +23,7 @@ const permissionButtons = {
 
                     if(!this.state.hasDoPageListening && trialUserPermisson){
                         //有ETA用户行为记录权限 而且没有执行过页面监听
-                        doPageEventListener()
+                        // doPageEventListener()
                     }
                     resolve('获取权限按钮成功')
                 })