system-clients 3.1.96 → 3.1.97-aode

package/src/components/server/RoleSelector.vue

@@ -1,89 +1,90 @@
-<template>
-    <div style="width: 100%;height: 100%">
-        <div class="col-sm-6">
-            <label class="font_normal_body">&nbsp;公&nbsp;&nbsp;&nbsp;&nbsp;司&nbsp;</label>
-            <right-tree :width="leftWidth" @re-res="getRes"></right-tree>
-        </div>
-        <div class="col-sm-6 ">
-            <label class="font_normal_body">{{roleLable}}</label>
-            <v-select :value.sync="value" v-model='model.f_checker_id'
-                      :value-single="true"
-                      class="select_list select"
-                      :options='users' :placeholder='roleName'
-                      close-on-select
-                      :width="rightWidth">
-            </v-select>
-        </div>
-    </div>
-</template>
-
-<script>
-  export default {
-    name: "RoleSelector",
-    props: {
-      roleName: {
-        type: String,
-        default: '安检员'
-      },
-      roleLable: {
-        type: String,
-        default: '安检员'
-      },
-      leftWidth: {
-        type: String,
-        default: '60%'
-      },
-      rightWidth: {
-        type: String,
-        default: '60%'
-      },
-      value: {
-        type: String,
-        default: ''
-      }
-    },
-    data() {
-      return {
-        source: `tool.getChildrenOfResName($${this.roleName}$)`,
-        allUsers: [],
-        users: [],
-        resids: []
-      }
-    },
-    ready() {
-      this.$resetpost('/rs/search', {data: {source: this.source, userid: this.$login.f.id}}, {resolveMsg: null, rejectMsg: null})
-        .then(res => {
-          console.log('res-->' + JSON.stringify(res))
-          this.allUsers = res.data
-        })
-    },
-    methods: {
-      getRes(obj) {
-        this.resids = obj.resids
-        console.log(this.resids)
-        this.filterUser(this.resids)
-        this.$dispatch('re-res',obj)
-      },
-      filterUser(resids) {
-        // 处理第一次进入页面值异常问题 
-        if(resids.length > 0 && typeof resids[0] == "object"){
-          resids = resids[0]
-        }
-        this.users = []
-        this.allUsers.forEach(user => {
-          if (resids.indexOf(user.orgid) != -1) {
-            this.users.push({label: user.name, value: user.name})
-          }
-        })
-        if(this.users.length > 0){
-          this.users = [{label: '全部', value: ''},...this.users]
-        }
-        console.log(this.users)
-      }
-    }
-  }
-</script>
-
-<style scoped>
-
-</style>
+<template>
+    <div style="width: 100%;height: 100%">
+        <div class="col-sm-6">
+            <label class="font_normal_body">&nbsp;公&nbsp;&nbsp;&nbsp;&nbsp;司&nbsp;</label>
+            <right-tree :width="leftWidth" @re-res="getRes"></right-tree>
+        </div>
+        <div class="col-sm-6 ">
+            <label class="font_normal_body">{{roleLable}}</label>
+            <v-select :value.sync="value" v-model='model.f_checker_id'
+                      :value-single="true"
+                      class="select_list select"
+                      :options='users' :placeholder='roleName'
+                      close-on-select
+                      :width="rightWidth">
+            </v-select>
+        </div>
+    </div>
+</template>
+
+<script>
+  export default {
+    name: "RoleSelector",
+    props: {
+      roleName: {
+        type: String,
+        default: '安检员'
+      },
+      roleLable: {
+        type: String,
+        default: '安检员'
+      },
+      leftWidth: {
+        type: String,
+        default: '60%'
+      },
+      rightWidth: {
+        type: String,
+        default: '60%'
+      },
+      value: {
+        type: String,
+        default: ''
+      }
+    },
+    data() {
+      return {
+        source: `tool.getChildrenOfResName($${this.roleName}$)`,
+        allUsers: [],
+        users: [],
+        resids: []
+      }
+    },
+    ready() {
+      this.$resetpost('/rs/search', {data: {source: this.source, userid: this.$login.f.id}}, {resolveMsg: null, rejectMsg: null})
+        .then(res => {
+          console.log('res-->' + JSON.stringify(res))
+          this.allUsers = res.data
+          this.filterUser([this.$login.f.orgid])
+        })
+    },
+    methods: {
+      getRes(obj) {
+        this.resids = obj.resids
+        console.log(this.resids)
+        this.filterUser(this.resids)
+        this.$dispatch('re-res',obj)
+      },
+      filterUser(resids) {
+        // 处理第一次进入页面值异常问题
+        if(resids.length > 0 && typeof resids[0] == "object"){
+            resids = resids[0]
+        }
+        this.users = []
+        this.allUsers.forEach(user => {
+          if (resids.indexOf(user.orgid) != -1) {
+            this.users.push({label: user.name, value: user.name})
+          }
+        })
+        if(this.users.length > 0){
+          this.users = [{label: '全部', value: ''},...this.users]
+        }
+        console.log(this.users)
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

package/src/plugins/GetLoginInfoService.js

@@ -180,13 +180,13 @@ 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){
-          //  Vue.showMessage(req.data.msg+",您将被强制退出系统", ['confirm']).then((res) => {
-           //   if (res === 'confirm') {
-           //     location.reload()
-            //  }
-            //})
-          //}
+          if(req.data.status==710){
+            // Vue.showMessage(req.data.msg+",您将被强制退出系统", ['confirm']).then((res) => {
+            //   if (res === 'confirm') {
+            //     location.reload()
+            //   }
+            // })
+          }
         })
       }, 2 * 60 * 1000)
     }