system-clients 3.1.97 → 3.2.0-1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "system-clients",
3
- "version": "3.1.97",
3
+ "version": "3.2.0-1",
4
4
  "description": "系统基础框架",
5
5
  "main": "src/index.js",
6
6
  "directories": {
@@ -14,8 +14,27 @@
14
14
  show: false
15
15
  }
16
16
  },
17
- ready () {
18
- this.$appdata.load()
17
+ props: {
18
+ componentName: {}
19
+ },
20
+ async ready () {
21
+ this.$nextTick(() => {
22
+ window.addEventListener('message', messageEvent => {
23
+ try {
24
+ const data = messageEvent.data
25
+ console.log('接收到数据', data)
26
+ this.$login = Object.assign(this.$login, data.login)
27
+ this.$appdata = Object.assign(this.$appdata, data.appdata)
28
+ if (!data.page) {
29
+ this.$showMessage('没有功能连接, 请配置!')
30
+ return
31
+ }
32
+ this.$goto(data.page)
33
+ } catch (e) {
34
+ console.log('登陆异常', e)
35
+ }
36
+ })
37
+ })
19
38
  }
20
39
  }
21
40
  </script>
@@ -1,106 +1,106 @@
1
- <template>
2
- <div>
3
- <validator name="v">
4
- <modal :show.sync="show" v-ref:modal backdrop="false">
5
- <header slot="modal-header" class="modal-header">
6
- <button type="button" class="close" @click="rest"><span>&times;</span></button>
7
- <h4 class="modal-title">修改密码</h4>
8
- </header>
9
- <article slot="modal-body" class="modal-body modifystyle auto form-horizontal">
10
- <div class="has-feedback form-group"
11
- :class="{'has-warning':$v.password.required,'has-error': $v.password.required,
12
- 'has-success':!$v.password.required}">
13
- <label for="password" class="col-sm-4 col-sm-offset-1 control-label">原始密码:&nbsp;&nbsp;</label>
14
- <div class="col-sm-4">
15
- <input type="password" v-model="deliver.password" class="form-control" id="password" v-validate:password="{ required: true}">
16
- <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.password.required"></span>
17
- <span v-if="$v.password.required">不能为空</span>
18
- </div>
19
- </div>
20
- <div class="has-feedback form-group"
21
- :class="{'has-warning':$v.newpassword.required,'has-error':$v.newpassword.strongpassword && !($v.newpassword.required),
22
- 'has-success': !$v.newpassword.required && !$v.newpassword.strongpassword }">
23
- <label for="newpassword" class="col-sm-4 col-sm-offset-1 control-label">新的密码:&nbsp;&nbsp;</label>
24
- <div class="col-sm-4">
25
- <input type="password" v-model="deliver.newpassword" class="form-control" id="newpassword" v-validate:newpassword='{required:true, strongpassword: true}'>
26
- <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.newpassword.required && !($v.newpassword.strongpassword && !($v.newpassword.required))"></span>
27
- <span v-if="$v.newpassword.required">不能为空</span>
28
- <span v-if="$v.newpassword.strongpassword && !($v.newpassword.required)">密码必须包含英文大小写、阿拉伯数字、字符</span>
29
- </div>
30
- </div>
31
- <div class="has-feedback form-group"
32
- :class="{'has-warning':$v.affirmpassword.required,'has-error':$v.affirmpassword.equalValid && !($v.affirmpassword.required),
33
- 'has-success': !$v.affirmpassword.required && !($v.affirmpassword.equalValid && !($v.affirmpassword.required))}">
34
- <label for="affirmpassword" class="col-sm-4 col-sm-offset-1 control-label">确认密码:&nbsp;&nbsp;</label>
35
- <div class="col-sm-4">
36
- <input type="password" v-model="deliver.affirmpassword" class="form-control" id="affirmpassword" v-validate:affirmpassword="{ required: true, equalValid: deliver.newpassword }">
37
- <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.affirmpassword.required && !($v.affirmpassword.equalValid && !($v.affirmpassword.required))"></span>
38
- <span v-if="$v.affirmpassword.required">不能为空</span>
39
- <span v-if="$v.affirmpassword.equalValid && !($v.affirmpassword.required)">两次密码不一致 !!</span>
40
- </div>
41
- </div>
42
- </article>
43
-
44
- <footer slot="modal-footer" class="modal-footer">
45
- <button type="button" class="btn btn-success" @click='confirm' :disabled="!$v.valid">确认</button>
46
- <button type="button" class="btn btn-default" @click='rest'>取消</button>
47
- </footer>
48
- </modal>
49
- </validator>
50
- </div>
51
-
52
-
53
- </template>
54
- <script>
55
- import co from 'co'
56
- import validator from '../../plugins/validation';
57
-
58
- let saveGen = function * (self) {
59
- self.deliver.ename = self.functions.ename
60
- // let res = yield self.$post('rs/user/entity', {data: self.deliver})
61
- // let res = yield self.$post('rs/db/modifypassword', {data: self.deliver})
62
- // let res = yield self.$resetpost('/rs/db/modifypwd', {data: self.deliver})
63
- // Util.f.password = self.deliver.newpassword
64
- let res = yield self.$resetpost('/rs/user/modifypwd', {data: self.deliver })
65
- self.$login.f.password = self.deliver.newpassword
66
- if (res.data) {
67
- self.deliver.password = ''
68
- self.deliver.newpassword = ''
69
- self.deliver.affirmpassword = ''
70
- self.show = false
71
- }
72
- }
73
- export default {
74
- title: '系统管理-密码修改',
75
- data () {
76
- return {
77
- deliver: {
78
- password: '',
79
- newpassword: '',
80
- affirmpassword: ''
81
- },
82
- functions: this.$login.f
83
- }
84
- },
85
- props: ['show'],
86
- methods: {
87
- confirm () {
88
- let gen = saveGen(this)
89
- co(gen)
90
- },
91
- rest () {
92
- this.show = false
93
- this.deliver = {password: '', newpassword: '', affirmpassword: ''}
94
- }
95
- }
96
- }
97
- </script>
98
- <style>
99
- /*修改密码body界面样式*/
100
- .modifystyle {
101
- background: #FCFEEE;
102
- }
103
- .modifystyle span{
104
- color: red;
105
- }
106
- </style>
1
+ <template>
2
+ <div>
3
+ <validator name="v">
4
+ <modal :show.sync="show" v-ref:modal backdrop="false">
5
+ <header slot="modal-header" class="modal-header">
6
+ <button type="button" class="close" @click="rest"><span>&times;</span></button>
7
+ <h4 class="modal-title">修改密码</h4>
8
+ </header>
9
+ <article slot="modal-body" class="modal-body modifystyle auto form-horizontal">
10
+ <div class="has-feedback form-group"
11
+ :class="{'has-warning':$v.password.required,'has-error': $v.password.required,
12
+ 'has-success':!$v.password.required}">
13
+ <label for="password" class="col-sm-4 col-sm-offset-1 control-label">原始密码:&nbsp;&nbsp;</label>
14
+ <div class="col-sm-4">
15
+ <input type="password" v-model="deliver.password" class="form-control" id="password" v-validate:password="{ required: true}">
16
+ <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.password.required"></span>
17
+ <span v-if="$v.password.required">不能为空</span>
18
+ </div>
19
+ </div>
20
+ <div class="has-feedback form-group"
21
+ :class="{'has-warning':$v.newpassword.required,'has-error':($v.newpassword.strongpassword || $v.newpassword.minlength)&& !$v.newpassword.required ,
22
+ 'has-success': !$v.newpassword.required && !$v.newpassword.strongpassword&&!$v.newpassword.minlength }">
23
+ <label for="newpassword" class="col-sm-4 col-sm-offset-1 control-label">新的密码:&nbsp;&nbsp;</label>
24
+ <div class="col-sm-4">
25
+ <input type="password" v-model="deliver.newpassword" class="form-control" id="newpassword" v-validate:newpassword='{required:true, strongpassword: true, minlength: 6}'>
26
+ <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.newpassword.required && !$v.newpassword.minlength && !($v.newpassword.strongpassword && !($v.newpassword.required))"></span>
27
+ <span v-if="$v.newpassword.required">不能为空</span>
28
+ <span v-if="($v.newpassword.strongpassword||$v.newpassword.minlength) && !($v.newpassword.required&&$v.newpassword.minlength)">密码长度不能小于六位,且必须包含英文大小写、阿拉伯数字、字符</span>
29
+ </div>
30
+ </div>
31
+ <div class="has-feedback form-group"
32
+ :class="{'has-warning':$v.affirmpassword.required,'has-error':$v.affirmpassword.equalValid && !($v.affirmpassword.required),
33
+ 'has-success': !$v.affirmpassword.required && !($v.affirmpassword.equalValid && !($v.affirmpassword.required))}">
34
+ <label for="affirmpassword" class="col-sm-4 col-sm-offset-1 control-label">确认密码:&nbsp;&nbsp;</label>
35
+ <div class="col-sm-4">
36
+ <input type="password" v-model="deliver.affirmpassword" class="form-control" id="affirmpassword" v-validate:affirmpassword="{ required: true, equalValid: deliver.newpassword }">
37
+ <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.affirmpassword.required && !($v.affirmpassword.equalValid && !($v.affirmpassword.required))"></span>
38
+ <span v-if="$v.affirmpassword.required">不能为空</span>
39
+ <span v-if="$v.affirmpassword.equalValid && !($v.affirmpassword.required)">两次密码不一致 !!</span>
40
+ </div>
41
+ </div>
42
+ </article>
43
+
44
+ <footer slot="modal-footer" class="modal-footer">
45
+ <button type="button" class="btn btn-success" @click='confirm' :disabled="!$v.valid">确认</button>
46
+ <button type="button" class="btn btn-default" @click='rest'>取消</button>
47
+ </footer>
48
+ </modal>
49
+ </validator>
50
+ </div>
51
+
52
+
53
+ </template>
54
+ <script>
55
+ import co from 'co'
56
+ import validator from '../../plugins/validation';
57
+
58
+ let saveGen = function * (self) {
59
+ self.deliver.ename = self.functions.ename
60
+ // let res = yield self.$post('rs/user/entity', {data: self.deliver})
61
+ // let res = yield self.$post('rs/db/modifypassword', {data: self.deliver})
62
+ // let res = yield self.$resetpost('/rs/db/modifypwd', {data: self.deliver})
63
+ // Util.f.password = self.deliver.newpassword
64
+ let res = yield self.$resetpost('/rs/user/modifypwd', {data: self.deliver })
65
+ self.$login.f.password = self.deliver.newpassword
66
+ if (res.data) {
67
+ self.deliver.password = ''
68
+ self.deliver.newpassword = ''
69
+ self.deliver.affirmpassword = ''
70
+ self.show = false
71
+ }
72
+ }
73
+ export default {
74
+ title: '系统管理-密码修改',
75
+ data () {
76
+ return {
77
+ deliver: {
78
+ password: '',
79
+ newpassword: '',
80
+ affirmpassword: ''
81
+ },
82
+ functions: this.$login.f
83
+ }
84
+ },
85
+ props: ['show'],
86
+ methods: {
87
+ confirm () {
88
+ let gen = saveGen(this)
89
+ co(gen)
90
+ },
91
+ rest () {
92
+ this.show = false
93
+ this.deliver = {password: '', newpassword: '', affirmpassword: ''}
94
+ }
95
+ }
96
+ }
97
+ </script>
98
+ <style>
99
+ /*修改密码body界面样式*/
100
+ .modifystyle {
101
+ background: #FCFEEE;
102
+ }
103
+ .modifystyle span{
104
+ color: red;
105
+ }
106
+ </style>
@@ -178,15 +178,19 @@ let loginGen = async function (name, password) {
178
178
  // 定时发送心跳
179
179
  setInterval(()=> {
180
180
  let http = new HttpResetClass()
181
- //暂时不出现不出现异地登录校验
181
+ //暂时不出现不出现异地登录校验
182
182
  http.load('POST', `rs/user/access/${Vue.$login.f.id}`, {}, {resolveMsg: null, rejectMsg: null}).then((req) => {
183
- //if(req.data.status==710){
184
- // Vue.showMessage(req.data.msg+",您将被强制退出系统", ['confirm']).then((res) => {
185
- // if (res === 'confirm') {
186
- // location.reload()
187
- // }
188
- //})
189
- //}
183
+ if(req.data.forcestate && req.data.forcestate == 1){
184
+ Vue.showMessage("您被强制下线!", ['confirm']).then((res) => {
185
+ location.reload()
186
+ })
187
+ }else if(req.data.status==710){
188
+ Vue.showMessage(req.data.msg+",您将被强制退出系统", ['confirm']).then((res) => {
189
+ if (res === 'confirm') {
190
+ location.reload()
191
+ }
192
+ })
193
+ }
190
194
  })
191
195
  }, 2 * 60 * 1000)
192
196
  }