system-clients 3.0.46-fanxian → 3.0.47-fanxian

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.
Files changed (97) hide show
  1. package/.babelrc +5 -5
  2. package/.editorconfig +9 -9
  3. package/.eslintrc.js +16 -16
  4. package/.gradle/buildOutputCleanup/cache.properties +2 -2
  5. package/CHANGELOG.md +51 -51
  6. package/README.md +36 -36
  7. package/SystemClient.iml +11 -11
  8. package/build/css-loaders.js +34 -34
  9. package/build/dev-client.js +8 -8
  10. package/build/example-server.js +80 -80
  11. package/build/release.sh +28 -28
  12. package/build/utils.js +71 -71
  13. package/build/webpack.dev.conf.js +31 -31
  14. package/build/webpack.example.conf.js +49 -49
  15. package/build/webpack.prod.conf.js +60 -60
  16. package/build/webpack.test.conf.js +31 -31
  17. package/build.gradle +6 -6
  18. package/config/dev.env.js +6 -6
  19. package/config/index.js +38 -38
  20. package/config/prod.env.js +3 -3
  21. package/config/test.env.js +6 -6
  22. package/doc/Login.md +7 -7
  23. package/examples/ReadCard/App.vue +23 -23
  24. package/examples/ReadCard/index.html +11 -11
  25. package/examples/ReadCard/main.js +12 -12
  26. package/index.html +21 -21
  27. package/package.json +1 -1
  28. package/release.bat +5 -5
  29. package/src/App.vue +24 -24
  30. package/src/LodopFuncs.js +123 -123
  31. package/src/assets/binding.svg +1 -1
  32. package/src/assets/unbind.svg +1 -1
  33. package/src/assets//345/205/254/345/221/212.svg +1 -1
  34. package/src/assets//347/207/203/346/260/224/347/274/264/350/264/271.eps +116 -116
  35. package/src/assets//350/201/224/347/263/273/346/210/221/344/273/254.svg +1 -1
  36. package/src/components/List.vue +51 -51
  37. package/src/components/Table.js +74 -74
  38. package/src/components/Util.js +343 -343
  39. package/src/components/equipment/EquipmentManage.vue +65 -65
  40. package/src/components/equipment/PcAdd.vue +105 -105
  41. package/src/components/equipment/PcList.vue +119 -119
  42. package/src/components/equipment/PcManage.vue +60 -60
  43. package/src/components/equipment/PhoneAdd.vue +94 -94
  44. package/src/components/equipment/PhoneList.vue +102 -102
  45. package/src/components/equipment/PhoneManage.vue +60 -60
  46. package/src/components/equipment/PosAdd.vue +137 -137
  47. package/src/components/equipment/PosList.vue +156 -156
  48. package/src/components/equipment/PosManage.vue +67 -67
  49. package/src/components/materialManage/materialData.vue +44 -44
  50. package/src/components/materialManage/materialList.vue +255 -255
  51. package/src/components/parammanage/ParamManage.vue +42 -42
  52. package/src/components/parammanage/ParamManages.vue +43 -43
  53. package/src/components/parammanage/ParamPage.vue +314 -314
  54. package/src/components/parammanage/ParamPages.vue +214 -214
  55. package/src/components/parammanage/SinglePage.vue +237 -237
  56. package/src/components/parammanage/SinglePages.vue +161 -161
  57. package/src/components/server/AddChangeMsg.vue +66 -66
  58. package/src/components/server/ChangeDeclare.vue +45 -45
  59. package/src/components/server/IconTree.vue +26 -26
  60. package/src/components/server/LeftTree.vue +111 -111
  61. package/src/components/server/LoadData.vue +36 -36
  62. package/src/components/server/Login.vue +625 -623
  63. package/src/components/server/Menu.vue +188 -188
  64. package/src/components/server/ModifyPw.vue +125 -106
  65. package/src/components/server/ResSelect.vue +150 -150
  66. package/src/components/server/ResSelectGroup.vue +140 -140
  67. package/src/components/server/RightTree.vue +263 -263
  68. package/src/components/server/RoleSelector.vue +88 -88
  69. package/src/components/server/TestResSelect.vue +58 -58
  70. package/src/components/server/TestResSelectGroup.vue +388 -388
  71. package/src/components/server/TestRightTree.vue +42 -42
  72. package/src/index.js +7 -7
  73. package/src/plugins/GetLoginInfoService.js +509 -498
  74. package/src/plugins/validation.js +7 -7
  75. package/src/project/ProjectPage.vue +24 -24
  76. package/src/project/State.js +17 -17
  77. package/src/stores/AppData.js +38 -38
  78. package/src/systemphone.js +11 -11
  79. package/src/util/LdapHelper.js +75 -75
  80. package/test/e2e/custom-assertions/elementCount.js +26 -26
  81. package/test/e2e/nightwatch.conf.js +40 -40
  82. package/test/e2e/runner.js +30 -30
  83. package/test/e2e/specs/test.js +14 -14
  84. package/test/unit/.eslintrc +5 -5
  85. package/test/unit/index.js +13 -13
  86. package/test/unit/init.js +10 -10
  87. package/test/unit/karma.conf.js +49 -49
  88. package/test/unit/specs/base64.spec.js +5 -5
  89. package/test/unit/specs/components/parammanage/ParamPage.spec.js +20 -20
  90. package/test/unit/specs/components/parammanage/SinglePage.spec.js +20 -20
  91. package/test/unit/specs/components/server/LeftTree/App.vue +18 -18
  92. package/test/unit/specs/components/server/LeftTree/LeftTree.spec.js +22 -22
  93. package/test/unit/specs/components/server/LoadData.spec.js +24 -24
  94. package/test/unit/specs/components/server/Login.spec.js +61 -61
  95. package/test/unit/specs/components/server/RightTree.spec.js +50 -50
  96. package/test/unit/specs/plugins/GetLoginInfoService.spec.js +55 -55
  97. package/test/unit/test.html +76 -76
@@ -1,188 +1,188 @@
1
- <template>
2
- <div class="auto">
3
- <div class="head">
4
- <img src="../../../static/loginlogo.png" alt="图片加载未完成"
5
- style="float:left;width: 100px; height: 80px; margin: 10px 20px 20px 20px;"/>
6
- <div style="float:left;width:auto;height:130px;padding-top:10px;">
7
- <h3 style="font-size: 22px;">欢迎使用陕西燃气管理系统</h3>
8
- <h5 style="font-size: 15px;">Welcome to ShanXi GAS Manage System</h5>
9
- </div>
10
-
11
- <h5 style="float:right;margin-top:70px;margin-right:80px;">
12
-
13
- <span class="glyphicon glyphicon-calendar"></span>
14
- {{ date }}&nbsp;&nbsp;
15
-
16
- <span class="glyphicon glyphicon-copyright-mark"></span>
17
- 系统版本:V1.0.0&nbsp;&nbsp;
18
-
19
- <span class="glyphicon glyphicon-th-large"></span>
20
- 蓝色主题&nbsp;&nbsp;
21
- <a href="#" style="color:#fff;text-decoration:none;" @click.stop.prevent="modify=true">
22
- <span class="glyphicon glyphicon-cog"></span>
23
- 修改密码
24
- </a>
25
- </h5>
26
- </div>
27
- <div class="auto">
28
- <!-- 白线div -->
29
- <div class="whiteline">
30
- </div>
31
- <select-menu :model="functions.functions"></select-menu>
32
- </div>
33
- <modal v-ref:modal :show.sync="modify" :backdrop="false" class="auto">
34
- <header slot="modal-header" class="modal-header">
35
- <h4 class="modal-title">修改密码</h4>
36
- </header>
37
- <article slot="modal-body" class="modal-body modifystyle">
38
- <validator name="v">
39
-
40
- <div class="has-feedback"
41
- :class="{'has-warning':$v.password.required,'has-error':$v.password.equalValid && !($v.password.required),
42
- 'has-success': !$v.password.required && !($v.password.equalValid && !($v.password.required))}">
43
- <label for="password" class="control-label">原始密码:&nbsp;&nbsp;</label>
44
- <input type="password" v-model="deliver.password" class="form-control" id="password" v-validate:password="{ required: true, equalValid: functions.password }">
45
- <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.password.required && !($v.password.equalValid && !($v.password.required))"></span>
46
- <!-- <span class="glyphicon form-control-feedback"
47
- :class="{'glyphicon-warning-sign':$v.password.required,'glyphicon-remove'$v.password.equalValid && !($v.password.required):,
48
- 'glyphicon-ok':!$v.password.required && !($v.password.equalValid && !($v.password.required))}"></span> -->
49
- <span v-if="$v.password.required">不能为空</span>
50
- <span v-if="$v.password.equalValid && !($v.password.required)">原始密码错误 !!</span>
51
- </div>
52
-
53
- <div class="has-feedback"
54
- :class="{'has-warning':$v.newpassword.required, 'has-success': !$v.newpassword.required}">
55
- <label for="newpassword" class="control-label">新的密码:&nbsp;&nbsp;</label>
56
- <input type="password" v-model="deliver.newpassword" class="form-control" id="newpassword" v-validate:newpassword='{ required: true }'>
57
- <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.newpassword.required"></span>
58
- <!-- <span class="glyphicon form-control-feedback"
59
- :class="{'glyphicon-warning-sign':$v.newpassword.required,'glyphicon-ok':!$v.newpassword.required }"></span> -->
60
- <span v-if="$v.newpassword.required">不能为空</span>
61
- </div>
62
-
63
- <div class="has-feedback"
64
- :class="{'has-warning':$v.affirmpassword.required,'has-error':$v.affirmpassword.equalValid && !($v.affirmpassword.required),
65
- 'has-success': !$v.affirmpassword.required && !($v.affirmpassword.equalValid && !($v.affirmpassword.required))}">
66
- <label for="affirmpassword" class="control-label">确认密码:&nbsp;&nbsp;</label>
67
- <input type="password" v-model="deliver.affirmpassword" class="form-control" id="affirmpassword" v-validate:affirmpassword="{ required: true, equalValid: deliver.newpassword }">
68
- <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.affirmpassword.required && !($v.affirmpassword.equalValid && !($v.affirmpassword.required))"></span>
69
- <!-- <span class="glyphicon form-control-feedback"
70
- :class="{'glyphicon-warning-sign':$v.affirmpassword.required,'glyphicon-remove'$v.affirmpassword.equalValid && !($v.affirmpassword.required):,
71
- 'glyphicon-ok':!$v.affirmpassword.required && !($v.affirmpassword.equalValid && !($v.affirmpassword.required))}"></span> -->
72
- <span v-if="$v.affirmpassword.required">不能为空</span>
73
- <span v-if="$v.affirmpassword.equalValid && !($v.affirmpassword.required)">两次密码不一致 !!</span>
74
- </div>
75
-
76
- </validator>
77
- </article>
78
- <footer slot="modal-footer" class="footerbtn">
79
- <button type="button" class="btn btn-success" @click='confirm' :disabled="!$v.valid">确认</button>
80
- <button type="button" class="btn btn-default" @click='close'>取消</button>
81
- </footer>
82
- <modal>
83
- <!-- modifyPassword() -->
84
- </modal>
85
- </modal>
86
- </div>
87
- </template>
88
-
89
- <script>
90
- import co from 'co'
91
- import * as Util from '../Util'
92
-
93
- let saveGen = function * (self) {
94
- self.deliver.ename = self.functions.ename
95
- // let res = yield self.$post('rs/user/entity', {data: self.deliver})
96
- // let res = yield self.$post('rs/db/modifypassword', {data: self.deliver})
97
- let res = yield self.$post('rs/db/modifypwd', {data: self.deliver})
98
- if (res.status === 200 || res.status === 204) {
99
- self.modify = false
100
- self.deliver.password = ''
101
- self.deliver.newpassword = ''
102
- self.deliver.affirmpassword = ''
103
- }
104
- }
105
-
106
- export default {
107
- title: '菜单选择',
108
- props: ['functions'],
109
- data () {
110
- return {
111
- modify: false,
112
- deliver: {
113
- password: '',
114
- newpassword: '',
115
- affirmpassword: ''
116
- }
117
- }
118
- },
119
- computed: {
120
- date () {
121
- return Util.getNowDate()
122
- }
123
- },
124
- methods: {
125
- open (row) {
126
- if (row.link) {
127
- // this.$goto(row.link, {userid: this.functions, source: {isRead: 'modify'}}, 'home-page')
128
- this.$goto(row.link, {f: this.functions}, 'home-page')
129
- }
130
- },
131
- // 修改密码操作
132
- close () {
133
- this.modify = false
134
- },
135
- confirm () {
136
- let gen = saveGen(this)
137
- co(gen)
138
- }
139
- },
140
- events: {
141
- 'select-changed': function (data) {
142
- // 事件回调内的 `this` 自动绑定到注册它的实例上
143
- this.open(data.val)
144
- }
145
- }
146
- }
147
- </script>
148
- <style>
149
- /* 头部样式,大部分使用放在标签内 */
150
- .head {
151
- color: #fff;
152
- height: 110px;
153
- width: 100%;
154
- }
155
- /* 菜单头部与内容区域的中间的白色线 */
156
- .whiteline {
157
- height: 1px;
158
- background: #fff;
159
- margin: 0px 30px;
160
- }
161
- /*修改密码body界面样式*/
162
- .modifystyle {
163
- background: #FCFEEE;
164
- }
165
- .modifystyle div{
166
- height: auto;
167
- margin-bottom: 15px;
168
- /*text-align: center;*/
169
- margin-left: 20%;
170
- }
171
- /*bootstrap字体图标要手动调整,所以使用字体图标的span必须紧跟在input后面,负责会错位*/
172
- .modifystyle div input + span{
173
- top: 0!important;
174
- right: 32%;
175
- }
176
- .modifystyle span{
177
- color: red;
178
- }
179
- /*修改密码底部按钮部分样式*/
180
- .footerbtn {
181
- text-align: center;
182
- padding: 15px;
183
- }
184
- .footerbtn button {
185
- width: 100px;
186
- margin-left: 20px;
187
- }
188
- </style>
1
+ <template>
2
+ <div class="auto">
3
+ <div class="head">
4
+ <img src="../../../static/loginlogo.png" alt="图片加载未完成"
5
+ style="float:left;width: 100px; height: 80px; margin: 10px 20px 20px 20px;"/>
6
+ <div style="float:left;width:auto;height:130px;padding-top:10px;">
7
+ <h3 style="font-size: 22px;">欢迎使用陕西燃气管理系统</h3>
8
+ <h5 style="font-size: 15px;">Welcome to ShanXi GAS Manage System</h5>
9
+ </div>
10
+
11
+ <h5 style="float:right;margin-top:70px;margin-right:80px;">
12
+
13
+ <span class="glyphicon glyphicon-calendar"></span>
14
+ {{ date }}&nbsp;&nbsp;
15
+
16
+ <span class="glyphicon glyphicon-copyright-mark"></span>
17
+ 系统版本:V1.0.0&nbsp;&nbsp;
18
+
19
+ <span class="glyphicon glyphicon-th-large"></span>
20
+ 蓝色主题&nbsp;&nbsp;
21
+ <a href="#" style="color:#fff;text-decoration:none;" @click.stop.prevent="modify=true">
22
+ <span class="glyphicon glyphicon-cog"></span>
23
+ 修改密码
24
+ </a>
25
+ </h5>
26
+ </div>
27
+ <div class="auto">
28
+ <!-- 白线div -->
29
+ <div class="whiteline">
30
+ </div>
31
+ <select-menu :model="functions.functions"></select-menu>
32
+ </div>
33
+ <modal v-ref:modal :show.sync="modify" :backdrop="false" class="auto">
34
+ <header slot="modal-header" class="modal-header">
35
+ <h4 class="modal-title">修改密码</h4>
36
+ </header>
37
+ <article slot="modal-body" class="modal-body modifystyle">
38
+ <validator name="v">
39
+
40
+ <div class="has-feedback"
41
+ :class="{'has-warning':$v.password.required,'has-error':$v.password.equalValid && !($v.password.required),
42
+ 'has-success': !$v.password.required && !($v.password.equalValid && !($v.password.required))}">
43
+ <label for="password" class="control-label">原始密码:&nbsp;&nbsp;</label>
44
+ <input type="password" v-model="deliver.password" class="form-control" id="password" v-validate:password="{ required: true, equalValid: functions.password }">
45
+ <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.password.required && !($v.password.equalValid && !($v.password.required))"></span>
46
+ <!-- <span class="glyphicon form-control-feedback"
47
+ :class="{'glyphicon-warning-sign':$v.password.required,'glyphicon-remove'$v.password.equalValid && !($v.password.required):,
48
+ 'glyphicon-ok':!$v.password.required && !($v.password.equalValid && !($v.password.required))}"></span> -->
49
+ <span v-if="$v.password.required">不能为空</span>
50
+ <span v-if="$v.password.equalValid && !($v.password.required)">原始密码错误 !!</span>
51
+ </div>
52
+
53
+ <div class="has-feedback"
54
+ :class="{'has-warning':$v.newpassword.required, 'has-success': !$v.newpassword.required}">
55
+ <label for="newpassword" class="control-label">新的密码:&nbsp;&nbsp;</label>
56
+ <input type="password" v-model="deliver.newpassword" class="form-control" id="newpassword" v-validate:newpassword='{ required: true }'>
57
+ <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.newpassword.required"></span>
58
+ <!-- <span class="glyphicon form-control-feedback"
59
+ :class="{'glyphicon-warning-sign':$v.newpassword.required,'glyphicon-ok':!$v.newpassword.required }"></span> -->
60
+ <span v-if="$v.newpassword.required">不能为空</span>
61
+ </div>
62
+
63
+ <div class="has-feedback"
64
+ :class="{'has-warning':$v.affirmpassword.required,'has-error':$v.affirmpassword.equalValid && !($v.affirmpassword.required),
65
+ 'has-success': !$v.affirmpassword.required && !($v.affirmpassword.equalValid && !($v.affirmpassword.required))}">
66
+ <label for="affirmpassword" class="control-label">确认密码:&nbsp;&nbsp;</label>
67
+ <input type="password" v-model="deliver.affirmpassword" class="form-control" id="affirmpassword" v-validate:affirmpassword="{ required: true, equalValid: deliver.newpassword }">
68
+ <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.affirmpassword.required && !($v.affirmpassword.equalValid && !($v.affirmpassword.required))"></span>
69
+ <!-- <span class="glyphicon form-control-feedback"
70
+ :class="{'glyphicon-warning-sign':$v.affirmpassword.required,'glyphicon-remove'$v.affirmpassword.equalValid && !($v.affirmpassword.required):,
71
+ 'glyphicon-ok':!$v.affirmpassword.required && !($v.affirmpassword.equalValid && !($v.affirmpassword.required))}"></span> -->
72
+ <span v-if="$v.affirmpassword.required">不能为空</span>
73
+ <span v-if="$v.affirmpassword.equalValid && !($v.affirmpassword.required)">两次密码不一致 !!</span>
74
+ </div>
75
+
76
+ </validator>
77
+ </article>
78
+ <footer slot="modal-footer" class="footerbtn">
79
+ <button type="button" class="btn btn-success" @click='confirm' :disabled="!$v.valid">确认</button>
80
+ <button type="button" class="btn btn-default" @click='close'>取消</button>
81
+ </footer>
82
+ <modal>
83
+ <!-- modifyPassword() -->
84
+ </modal>
85
+ </modal>
86
+ </div>
87
+ </template>
88
+
89
+ <script>
90
+ import co from 'co'
91
+ import * as Util from '../Util'
92
+
93
+ let saveGen = function * (self) {
94
+ self.deliver.ename = self.functions.ename
95
+ // let res = yield self.$post('rs/user/entity', {data: self.deliver})
96
+ // let res = yield self.$post('rs/db/modifypassword', {data: self.deliver})
97
+ let res = yield self.$post('rs/db/modifypwd', {data: self.deliver})
98
+ if (res.status === 200 || res.status === 204) {
99
+ self.modify = false
100
+ self.deliver.password = ''
101
+ self.deliver.newpassword = ''
102
+ self.deliver.affirmpassword = ''
103
+ }
104
+ }
105
+
106
+ export default {
107
+ title: '菜单选择',
108
+ props: ['functions'],
109
+ data () {
110
+ return {
111
+ modify: false,
112
+ deliver: {
113
+ password: '',
114
+ newpassword: '',
115
+ affirmpassword: ''
116
+ }
117
+ }
118
+ },
119
+ computed: {
120
+ date () {
121
+ return Util.getNowDate()
122
+ }
123
+ },
124
+ methods: {
125
+ open (row) {
126
+ if (row.link) {
127
+ // this.$goto(row.link, {userid: this.functions, source: {isRead: 'modify'}}, 'home-page')
128
+ this.$goto(row.link, {f: this.functions}, 'home-page')
129
+ }
130
+ },
131
+ // 修改密码操作
132
+ close () {
133
+ this.modify = false
134
+ },
135
+ confirm () {
136
+ let gen = saveGen(this)
137
+ co(gen)
138
+ }
139
+ },
140
+ events: {
141
+ 'select-changed': function (data) {
142
+ // 事件回调内的 `this` 自动绑定到注册它的实例上
143
+ this.open(data.val)
144
+ }
145
+ }
146
+ }
147
+ </script>
148
+ <style>
149
+ /* 头部样式,大部分使用放在标签内 */
150
+ .head {
151
+ color: #fff;
152
+ height: 110px;
153
+ width: 100%;
154
+ }
155
+ /* 菜单头部与内容区域的中间的白色线 */
156
+ .whiteline {
157
+ height: 1px;
158
+ background: #fff;
159
+ margin: 0px 30px;
160
+ }
161
+ /*修改密码body界面样式*/
162
+ .modifystyle {
163
+ background: #FCFEEE;
164
+ }
165
+ .modifystyle div{
166
+ height: auto;
167
+ margin-bottom: 15px;
168
+ /*text-align: center;*/
169
+ margin-left: 20%;
170
+ }
171
+ /*bootstrap字体图标要手动调整,所以使用字体图标的span必须紧跟在input后面,负责会错位*/
172
+ .modifystyle div input + span{
173
+ top: 0!important;
174
+ right: 32%;
175
+ }
176
+ .modifystyle span{
177
+ color: red;
178
+ }
179
+ /*修改密码底部按钮部分样式*/
180
+ .footerbtn {
181
+ text-align: center;
182
+ padding: 15px;
183
+ }
184
+ .footerbtn button {
185
+ width: 100px;
186
+ margin-left: 20px;
187
+ }
188
+ </style>
@@ -1,106 +1,125 @@
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.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
+ console.log("修改密码返回:" , res.data)
68
+ // 兼容旧版ldao,旧版不返回code
69
+ if (res.data.code === 200) {
70
+ self.deliver.password = ''
71
+ self.deliver.newpassword = ''
72
+ self.deliver.affirmpassword = ''
73
+ self.show = false
74
+ self.$showAlert("修改密码成功", 'success', 2000)
75
+ } else {
76
+ // 兼容旧版ldao,旧版不返回code
77
+ self.deliver.password = ''
78
+ self.deliver.newpassword = ''
79
+ self.deliver.affirmpassword = ''
80
+ self.show = false
81
+ self.$showAlert("修改密码成功", 'success', 2000)
82
+ }
83
+ } else {
84
+ if (res.data.code) {
85
+ self.$showAlert("修改密码失败,原因:" + res.data.msg, 'warning', 2000)
86
+ } else {
87
+ self.$showMessage(res.data)
88
+ }
89
+ }
90
+ }
91
+
92
+ export default {
93
+ title: '系统管理-密码修改',
94
+ data () {
95
+ return {
96
+ deliver: {
97
+ password: '',
98
+ newpassword: '',
99
+ affirmpassword: ''
100
+ },
101
+ functions: this.$login.f
102
+ }
103
+ },
104
+ props: ['show'],
105
+ methods: {
106
+ confirm () {
107
+ let gen = saveGen(this)
108
+ co(gen)
109
+ },
110
+ rest () {
111
+ this.show = false
112
+ this.deliver = {password: '', newpassword: '', affirmpassword: ''}
113
+ }
114
+ }
115
+ }
116
+ </script>
117
+ <style>
118
+ /*修改密码body界面样式*/
119
+ .modifystyle {
120
+ background: #FCFEEE;
121
+ }
122
+ .modifystyle span{
123
+ color: red;
124
+ }
125
+ </style>