eoss-ui 0.7.90 → 0.7.92

package/packages/main/src/main.vue

@@ -232,12 +232,12 @@ export default {
           ) {
             window.location.href = './login.html';
           } else {
-            next('/login');
+            this.$router.replace('/login');
           }
         } else if (window.location.href.indexOf('main.html') > -1) {
           window.location.href = './login.html';
         } else {
-          next('/login');
+          this.$router.replace('/login');
         }
       }
     },
@@ -350,10 +350,11 @@ export default {
               const loginPage =
                 util.getStorage('login') || util.getStorage('loginPage');
               try {
+                const topWin = util.getWinTop();
                 if (loginPage) {
                   let src;
                   if (!util.startWith(loginPage, ['http', '/'], true)) {
-                    let pathname = util.win.top.location.pathname;
+                    let pathname = topWin.location.pathname;
                     if (pathname !== '/') {
                       pathname = pathname.split('/');
                       pathname.splice(pathname.length - 1);
@@ -365,19 +366,17 @@ export default {
                   } else {
                     src = loginPage;
                   }
-                  util.win.top.location.href = src;
-                } else if (
-                  util.win.top.location.href.indexOf('main.html') > -1
-                ) {
-                  util.win.top.location.href = './login.html';
+                  topWin.location.href = src;
+                } else if (topWin.location.href.indexOf('main.html') > -1) {
+                  topWin.location.href = './login.html';
                 } else {
-                  const hash = util.win.top.location.hash;
+                  const hash = topWin.location.hash;
                   if (hash) {
-                    const len = util.win.top.location.href.indexOf(hash);
-                    util.win.top.location.href =
+                    const len = topWin.location.href.indexOf(hash);
+                    topWin.location.href =
                       util.win.location.href.slice(0, len) + '#/login';
                   } else {
-                    util.win.top.location.href = '/login.html';
+                    topWin.location.href = '/login.html';
                   }
                 }
               } catch (error) {}
@@ -458,13 +457,8 @@ export default {
       if (name) {
         let w = 0;
         let h = 0;
-        try {
-          w = width ? width : util.win.top.screen.availWidth - 10;
-          h = height ? height : util.win.top.screen.availHeight - 60;
-        } catch (error) {
-          w = width ? width : util.win.screen.availWidth - 10;
-          h = height ? height : util.win.screen.availHeight - 60;
-        }
+        w = width ? width : util.win.screen.availWidth - 10;
+        h = height ? height : util.win.screen.availHeight - 60;
         return util.win.open(
           src,
           name,

package/packages/main/src/public/online.vue

@@ -1,89 +1,89 @@
-<template>
-  <es-data-table
-    numbers
-    :url="sysuseronline"
-    :thead="thead"
-    page
-  ></es-data-table>
-</template>
-
-<script>
-import { userOnline } from 'eoss-ui/src/config/api.js';
-export default {
-  name: 'Online',
-  components: {},
-  props: {
-    sysuseronline: {
-      type: String,
-      default: userOnline
-    }
-  },
-  data() {
-    return {
-      thead: [
-        {
-          title: '单位',
-          field: 'orgName',
-          minWidth: 120
-        },
-        {
-          title: '部门',
-          field: 'depName',
-          align: 'center',
-          minWidth: 120
-        },
-        {
-          title: '姓名',
-          field: 'userName',
-          align: 'center',
-          width: 120
-        },
-        {
-          title: '职务',
-          field: 'position',
-          align: 'center',
-          width: 120
-        },
-        {
-          title: '账号',
-          field: 'loginName',
-          align: 'center',
-          width: 120
-        },
-        {
-          title: '登录时间',
-          field: 'loginDate',
-          align: 'center',
-          width: 170
-        },
-        {
-          title: '登录次数',
-          field: 'freQuency',
-          align: 'center',
-          width: 100
-        },
-        {
-          title: '登录方式',
-          field: 'loginModel',
-          align: 'center',
-          width: 100,
-          render: (h, params) => {
-            let {
-              row: { loginModel }
-            } = params;
-            let types = ['普通登录', 'CA登录', '手机登录'];
-            return h('span', {}, [types[loginModel] || types[0]]);
-          }
-        }
-      ]
-    };
-  },
-  computed: {},
-  watch: {},
-  created() {},
-  mounted() {},
-  methods: {}
-};
-</script>
-
-<style lang="scss" scoped></style>
+<template>
+  <es-data-table
+    numbers
+    :url="sysuseronline"
+    :thead="thead"
+    page
+  ></es-data-table>
+</template>
+
+<script>
+import { userOnline } from 'eoss-ui/src/config/api.js';
+export default {
+  name: 'Online',
+  components: {},
+  props: {
+    sysuseronline: {
+      type: String,
+      default: userOnline
+    }
+  },
+  data() {
+    return {
+      thead: [
+        {
+          title: '单位',
+          field: 'orgName',
+          minWidth: 120
+        },
+        {
+          title: '部门',
+          field: 'depName',
+          align: 'center',
+          minWidth: 120
+        },
+        {
+          title: '姓名',
+          field: 'userName',
+          align: 'center',
+          width: 120
+        },
+        {
+          title: '职务',
+          field: 'position',
+          align: 'center',
+          width: 120
+        },
+        {
+          title: '账号',
+          field: 'loginName',
+          align: 'center',
+          width: 120
+        },
+        {
+          title: '登录时间',
+          field: 'loginDate',
+          align: 'center',
+          width: 170
+        },
+        {
+          title: '登录次数',
+          field: 'freQuency',
+          align: 'center',
+          width: 100
+        },
+        {
+          title: '登录方式',
+          field: 'loginModel',
+          align: 'center',
+          width: 100,
+          render: (h, params) => {
+            let {
+              row: { loginModel }
+            } = params;
+            let types = ['普通登录', 'CA登录', '手机登录'];
+            return h('span', {}, [types[loginModel] || types[0]]);
+          }
+        }
+      ]
+    };
+  },
+  computed: {},
+  watch: {},
+  created() {},
+  mounted() {},
+  methods: {}
+};
+</script>
+
+<style lang="scss" scoped></style>