system-clients 3.1.89-20 → 3.1.89-20-rongchuang-1

package/src/components/server/TestRightTree.vue

@@ -1,42 +1,42 @@
-<template>
-  <div class="col-sm-3 form-group form-input-group" style="width: 20%">
-    <label class="control-label">组织机构</label>
-    <right-tree :userid.sync='obj.userid'
-                :source.sync='obj.source'
-                :resobj='obj'
-                @re-res="getRes"></right-tree>
-  </div>
-</template>
-<script>
-  import { PagedList, HttpResetClass } from 'vue-client'
-
-  export default {
-    title: '资源树菜单',
-    props: {
-    },
-    data () {
-      return {
-        obj: {
-          userid: this.$login.f.id,
-          source: `tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
-          res: this.$login.f.f_fengongsi,
-          resids: this.$login.f.f_orgids
-        },
-      }
-    },
-    ready () {
-      //this.getRes1()
-    },
-    methods:{
-      getRes (obj) {
-        this.obj.res = obj.res
-        this.obj.resids = obj.resids
-      },
-    },
-    watch: {
-
-    },
-  }
-</script>
-<style media="screen">
-</style>
+<template>
+  <div class="col-sm-3 form-group form-input-group" style="width: 20%">
+    <label class="control-label">组织机构</label>
+    <right-tree :userid.sync='obj.userid'
+                :source.sync='obj.source'
+                :resobj='obj'
+                @re-res="getRes"></right-tree>
+  </div>
+</template>
+<script>
+  import { PagedList, HttpResetClass } from 'vue-client'
+
+  export default {
+    title: '资源树菜单',
+    props: {
+    },
+    data () {
+      return {
+        obj: {
+          userid: this.$login.f.id,
+          source: `tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
+          res: this.$login.f.f_fengongsi,
+          resids: this.$login.f.f_orgids
+        },
+      }
+    },
+    ready () {
+      //this.getRes1()
+    },
+    methods:{
+      getRes (obj) {
+        this.obj.res = obj.res
+        this.obj.resids = obj.resids
+      },
+    },
+    watch: {
+
+    },
+  }
+</script>
+<style media="screen">
+</style>

package/src/index.js

@@ -1,7 +1,7 @@
-import system from './system'
-import systemphone from './systemphone'
-
-export {
-  system,
-  systemphone
-}
+import system from './system'
+import systemphone from './systemphone'
+
+export {
+  system,
+  systemphone
+}

package/src/plugins/GetLoginInfoService.js

@@ -180,13 +180,15 @@ let loginGen = async function (name, password) {
         let http = new HttpResetClass()
 		//暂时不出现不出现异地登录校验
         http.load('POST', `rs/user/access/${Vue.$login.f.id}`, {}, {resolveMsg: null, rejectMsg: null}).then((req) => {
-          //if(req.data.status==710){
+          if(req.data.status==710){
+          Vue.prototype.$connectNumber = 0 //重连剩余次数
+          Vue.prototype.$socket.close() // 关闭websocket连接
           //  Vue.showMessage(req.data.msg+",您将被强制退出系统", ['confirm']).then((res) => {
            //   if (res === 'confirm') {
            //     location.reload()
             //  }
             //})
-          //}
+          }
         })
       }, 2 * 60 * 1000)
     }