system-clients 3.2.11 → 3.2.12

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.2.11",
3
+ "version": "3.2.12",
4
4
  "description": "系统基础框架",
5
5
  "main": "src/index.js",
6
6
  "directories": {
@@ -169,7 +169,7 @@ let getwartermakr = async function (self) {
169
169
  let result = await self.$resetpost('rs/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
170
170
  if (result && result.data.length > 0) {
171
171
  self.showwatermakeflag = true;
172
- createWaterMark(`${result.data[0].value}-${self.$login.f.name}`);
172
+ createWaterMark(`${result.data[0].value}${self.$login.f.ename}`);
173
173
  } else {
174
174
  self.showwatermakeflag = false;
175
175
  }
@@ -1,55 +1,55 @@
1
- <template>
2
- <div class="loadingdata" :class="{'loaderror': show, 'loadsuccess': !show}">
3
- <!-- <h2 style="margin: 0" v-if="show">{{msg}}</h2> -->
4
- <h2 style="margin: 0" v-if="show">参数加载失败,请检查网络状态和服务状态...</h2>
5
- </div>
6
- </template>
7
-
8
- <script>
9
- export default {
10
- title: '加载参数',
11
- data () {
12
- return {
13
- msg: '',
14
- show: false
15
- }
16
- },
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
- })
38
- }
39
- }
40
- </script>
41
- <style media="screen">
42
- .loadingdata {
43
- position: fixed;
44
- background: #fff;
45
- opacity: 0.6;
46
- top: 0;
47
- width: 100%;
48
- }
49
- .loaderror {
50
- opacity: 1;
51
- }
52
- .loadsuccess {
53
- display: none;
54
- }
55
- </style>
1
+ <template>
2
+ <div class="loadingdata" :class="{'loaderror': show, 'loadsuccess': !show}">
3
+ <!-- <h2 style="margin: 0" v-if="show">{{msg}}</h2> -->
4
+ <h2 style="margin: 0" v-if="show">参数加载失败,请检查网络状态和服务状态...</h2>
5
+ </div>
6
+ </template>
7
+
8
+ <script>
9
+ export default {
10
+ title: '加载参数',
11
+ data () {
12
+ return {
13
+ msg: '',
14
+ show: false
15
+ }
16
+ },
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
+ })
38
+ }
39
+ }
40
+ </script>
41
+ <style media="screen">
42
+ .loadingdata {
43
+ position: fixed;
44
+ background: #fff;
45
+ opacity: 0.6;
46
+ top: 0;
47
+ width: 100%;
48
+ }
49
+ .loaderror {
50
+ opacity: 1;
51
+ }
52
+ .loadsuccess {
53
+ display: none;
54
+ }
55
+ </style>
@@ -1,111 +1,111 @@
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.numbersAndLetter8to16 || $v.newpassword.minlength)&& !$v.newpassword.required && !$v.newpassword.chinesePassword,
22
- 'has-success': !$v.newpassword.required && !$v.newpassword.numbersAndLetter8to16&&!$v.newpassword.minlength && !$v.newpassword.chinesePassword}">
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, numbersAndLetter8to16: true, minlength: 6,chinesePassword: true}'>
26
- <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.newpassword.required && !$v.newpassword.minlength && !($v.newpassword.numbersAndLetter8to16 && !($v.newpassword.required)) && !($v.newpassword.chinesePassword) "></span>
27
- <span v-if="$v.newpassword.required">不能为空</span>
28
- <span v-if="($v.newpassword.numbersAndLetter8to16||$v.newpassword.minlength) && !($v.newpassword.required&&$v.newpassword.minlength)">密码必须是8~16位数字与字母组合</span>
29
- <span v-if="$v.newpassword.chinesePassword">密码不能包含中文</span>
30
- </div>
31
- </div>
32
- <div class="has-feedback form-group"
33
- :class="{'has-warning':$v.affirmpassword.required,'has-error':$v.affirmpassword.equalValid && !($v.affirmpassword.required),
34
- 'has-success': !$v.affirmpassword.required && !($v.affirmpassword.equalValid && !($v.affirmpassword.required))}">
35
- <label for="affirmpassword" class="col-sm-4 col-sm-offset-1 control-label">确认密码:&nbsp;&nbsp;</label>
36
- <div class="col-sm-4">
37
- <input type="password" v-model="deliver.affirmpassword" class="form-control" id="affirmpassword" v-validate:affirmpassword="{ required: true, equalValid: deliver.newpassword }">
38
- <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.affirmpassword.required && !($v.affirmpassword.equalValid && !($v.affirmpassword.required))"></span>
39
- <span v-if="$v.affirmpassword.required">不能为空</span>
40
- <span v-if="$v.affirmpassword.equalValid && !($v.affirmpassword.required)">两次密码不一致 !!</span>
41
- </div>
42
- </div>
43
- </article>
44
-
45
- <footer slot="modal-footer" class="modal-footer">
46
- <button type="button" class="btn btn-success" @click='confirm' :disabled="!$v.valid">确认</button>
47
- <button type="button" class="btn btn-default" @click='rest'>取消</button>
48
- </footer>
49
- </modal>
50
- </validator>
51
- </div>
52
-
53
-
54
- </template>
55
- <script>
56
- import co from 'co'
57
- import validator from '../../plugins/validation';
58
-
59
- let saveGen = function * (self) {
60
- self.deliver.ename = self.functions.ename
61
- // let res = yield self.$post('rs/user/entity', {data: self.deliver})
62
- // let res = yield self.$post('rs/db/modifypassword', {data: self.deliver})
63
- // let res = yield self.$resetpost('/rs/db/modifypwd', {data: self.deliver})
64
- // Util.f.password = self.deliver.newpassword
65
- let res = yield self.$resetpost('/rs/user/modifypwd', {data: self.deliver }, {resolveMsg: null,rejectMsg: null})
66
- self.$login.f.password = self.deliver.newpassword
67
- console.log(res.data)
68
- if (res.data == true) {
69
- self.$showAlert('修改成功!', 'success', 2000)
70
- self.deliver.password = ''
71
- self.deliver.newpassword = ''
72
- self.deliver.affirmpassword = ''
73
- self.show = false
74
- } else {
75
- self.$showMessage(res.data)
76
- }
77
- }
78
- export default {
79
- title: '系统管理-密码修改',
80
- data () {
81
- return {
82
- deliver: {
83
- password: '',
84
- newpassword: '',
85
- affirmpassword: ''
86
- },
87
- functions: this.$login.f
88
- }
89
- },
90
- props: ['show'],
91
- methods: {
92
- confirm () {
93
- let gen = saveGen(this)
94
- co(gen)
95
- },
96
- rest () {
97
- this.show = false
98
- this.deliver = {password: '', newpassword: '', affirmpassword: ''}
99
- }
100
- }
101
- }
102
- </script>
103
- <style>
104
- /*修改密码body界面样式*/
105
- .modifystyle {
106
- background: #FCFEEE;
107
- }
108
- .modifystyle span{
109
- color: red;
110
- }
111
- </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.numbersAndLetter8to16 || $v.newpassword.minlength)&& !$v.newpassword.required && !$v.newpassword.chinesePassword,
22
+ 'has-success': !$v.newpassword.required && !$v.newpassword.numbersAndLetter8to16&&!$v.newpassword.minlength && !$v.newpassword.chinesePassword}">
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, numbersAndLetter8to16: true, minlength: 6,chinesePassword: true}'>
26
+ <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.newpassword.required && !$v.newpassword.minlength && !($v.newpassword.numbersAndLetter8to16 && !($v.newpassword.required)) && !($v.newpassword.chinesePassword) "></span>
27
+ <span v-if="$v.newpassword.required">不能为空</span>
28
+ <span v-if="($v.newpassword.numbersAndLetter8to16||$v.newpassword.minlength) && !($v.newpassword.required&&$v.newpassword.minlength)">密码必须是8~16位数字与字母组合</span>
29
+ <span v-if="$v.newpassword.chinesePassword">密码不能包含中文</span>
30
+ </div>
31
+ </div>
32
+ <div class="has-feedback form-group"
33
+ :class="{'has-warning':$v.affirmpassword.required,'has-error':$v.affirmpassword.equalValid && !($v.affirmpassword.required),
34
+ 'has-success': !$v.affirmpassword.required && !($v.affirmpassword.equalValid && !($v.affirmpassword.required))}">
35
+ <label for="affirmpassword" class="col-sm-4 col-sm-offset-1 control-label">确认密码:&nbsp;&nbsp;</label>
36
+ <div class="col-sm-4">
37
+ <input type="password" v-model="deliver.affirmpassword" class="form-control" id="affirmpassword" v-validate:affirmpassword="{ required: true, equalValid: deliver.newpassword }">
38
+ <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.affirmpassword.required && !($v.affirmpassword.equalValid && !($v.affirmpassword.required))"></span>
39
+ <span v-if="$v.affirmpassword.required">不能为空</span>
40
+ <span v-if="$v.affirmpassword.equalValid && !($v.affirmpassword.required)">两次密码不一致 !!</span>
41
+ </div>
42
+ </div>
43
+ </article>
44
+
45
+ <footer slot="modal-footer" class="modal-footer">
46
+ <button type="button" class="btn btn-success" @click='confirm' :disabled="!$v.valid">确认</button>
47
+ <button type="button" class="btn btn-default" @click='rest'>取消</button>
48
+ </footer>
49
+ </modal>
50
+ </validator>
51
+ </div>
52
+
53
+
54
+ </template>
55
+ <script>
56
+ import co from 'co'
57
+ import validator from '../../plugins/validation';
58
+
59
+ let saveGen = function * (self) {
60
+ self.deliver.ename = self.functions.ename
61
+ // let res = yield self.$post('rs/user/entity', {data: self.deliver})
62
+ // let res = yield self.$post('rs/db/modifypassword', {data: self.deliver})
63
+ // let res = yield self.$resetpost('/rs/db/modifypwd', {data: self.deliver})
64
+ // Util.f.password = self.deliver.newpassword
65
+ let res = yield self.$resetpost('/rs/user/modifypwd', {data: self.deliver }, {resolveMsg: null,rejectMsg: null})
66
+ self.$login.f.password = self.deliver.newpassword
67
+ console.log(res.data)
68
+ if (res.data == true) {
69
+ self.$showAlert('修改成功!', 'success', 2000)
70
+ self.deliver.password = ''
71
+ self.deliver.newpassword = ''
72
+ self.deliver.affirmpassword = ''
73
+ self.show = false
74
+ } else {
75
+ self.$showMessage(res.data)
76
+ }
77
+ }
78
+ export default {
79
+ title: '系统管理-密码修改',
80
+ data () {
81
+ return {
82
+ deliver: {
83
+ password: '',
84
+ newpassword: '',
85
+ affirmpassword: ''
86
+ },
87
+ functions: this.$login.f
88
+ }
89
+ },
90
+ props: ['show'],
91
+ methods: {
92
+ confirm () {
93
+ let gen = saveGen(this)
94
+ co(gen)
95
+ },
96
+ rest () {
97
+ this.show = false
98
+ this.deliver = {password: '', newpassword: '', affirmpassword: ''}
99
+ }
100
+ }
101
+ }
102
+ </script>
103
+ <style>
104
+ /*修改密码body界面样式*/
105
+ .modifystyle {
106
+ background: #FCFEEE;
107
+ }
108
+ .modifystyle span{
109
+ color: red;
110
+ }
111
+ </style>