diff --git a/package-lock.json b/package-lock.json index c0ca0b7..38ee12a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4055,9 +4055,9 @@ "dev": true }, "element-ui": { - "version": "2.8.2", - "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.8.2.tgz", - "integrity": "sha512-LABKHKGUyewFNvpf9BQLecB659Wq0XYvyP1tBveZ4RWpdlPSylDfGW/RLvDYU7zuCBoRasdZAz7ryjOwq1lLNg==", + "version": "2.15.14", + "resolved": "https://registry.npmmirror.com/element-ui/-/element-ui-2.15.14.tgz", + "integrity": "sha512-2v9fHL0ZGINotOlRIAJD5YuVB8V7WKxrE9Qy7dXhRipa035+kF7WuU/z+tEmLVPBcJ0zt8mOu1DKpWcVzBK8IA==", "requires": { "async-validator": "~1.8.1", "babel-helper-vue-jsx-merge-props": "^2.0.0", @@ -10567,8 +10567,8 @@ }, "normalize-wheel": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz", - "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU=" + "resolved": "https://registry.npmmirror.com/normalize-wheel/-/normalize-wheel-1.0.1.tgz", + "integrity": "sha512-1OnlAPZ3zgrk8B91HyRj+eVv+kS5u+Z0SCsak6Xil/kmgEia50ga7zfkumayonZrImffAxPU/5WcyGhzetHNPA==" }, "now-and-later": { "version": "2.0.1", diff --git a/src/assets/scss/_base.scss b/src/assets/scss/_base.scss index 257be5a..fb1b904 100644 --- a/src/assets/scss/_base.scss +++ b/src/assets/scss/_base.scss @@ -237,7 +237,7 @@ img { width: 36px; height: auto; margin-right: 5px; - border-radius: 100%; + //border-radius: 100%; vertical-align: middle; } } diff --git a/src/views/modules/sys/user-add-or-update.vue b/src/views/modules/sys/user-add-or-update.vue index 0cf0365..b4b2187 100644 --- a/src/views/modules/sys/user-add-or-update.vue +++ b/src/views/modules/sys/user-add-or-update.vue @@ -87,6 +87,14 @@ + + + + + + + + @@ -137,6 +145,8 @@ export default { postList:[], dataForm: { id: 0, + ifsUsername:'', + ifsPassword:'', userName: '', password: '', comfirmPassword: '', @@ -316,6 +326,8 @@ export default { this.dataForm.post = data.user.post this.dataForm.postNo = data.user.postNo this.dataForm.domainControlAccount = data.user.domainControlAccount + this.dataForm.ifsUsername = data.user.ifsUsername + this.dataForm.ifsPassword = data.user.ifsPassword this.getBDPList() } }) @@ -343,7 +355,9 @@ export default { siteID: '', siteName: '', userDisplay: '', - domainControlAccount: '' + domainControlAccount: '', + ifsUsername:'', + ifsPassword:'', } } }) @@ -370,7 +384,9 @@ export default { 'buNo': this.dataForm.buNo, 'departmentNo': this.dataForm.departmentNo, 'postNo': this.dataForm.postNo, - 'domainControlAccount': this.dataForm.domainControlAccount + 'domainControlAccount': this.dataForm.domainControlAccount, + 'ifsUsername': this.dataForm.ifsUsername, + 'ifsPassword': this.dataForm.ifsPassword, }) }).then(({data}) => { if (data && data.code === 0) { diff --git a/src/views/modules/sys/user.vue b/src/views/modules/sys/user.vue index 569899d..cc770ee 100644 --- a/src/views/modules/sys/user.vue +++ b/src/views/modules/sys/user.vue @@ -89,6 +89,12 @@ align="center" :label="'域控账号'"> + + - + @@ -467,7 +467,7 @@ - + @@ -521,7 +521,7 @@ - +