From 725b0706937306c6341e5dddbcc4fd8de7b8f002 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期二, 01 四月 2025 10:13:18 +0800
Subject: [PATCH] 1、mdc模块实现各利用率图表页面功能并与后端进行联调 2、删除用户修改密码时的输入校验 3、删除用户管理冗余查询字段 4、调整DNC模块获取权限配置功能时调用的获取所有用户列表接口（原先接口有分页参数导致获取不完整）
---
src/views/system/modules/PasswordModal.vue | 211 ++++++++++++++++++++++++++--------------------------
1 files changed, 107 insertions(+), 104 deletions(-)
diff --git a/src/views/system/modules/PasswordModal.vue b/src/views/system/modules/PasswordModal.vue
index f9f897e..c73b25d 100644
--- a/src/views/system/modules/PasswordModal.vue
+++ b/src/views/system/modules/PasswordModal.vue
@@ -16,12 +16,13 @@
<a-input placeholder="璇疯緭鍏ョ敤鎴疯处鍙�" v-decorator="[ 'username', {}]" :readOnly="true"/>
</a-form-item>
- <a-form-item label="鐧诲綍瀵嗙爜" :labelCol="labelCol" :wrapperCol="wrapperCol" hasFeedback >
- <a-input type="password" placeholder="璇疯緭鍏ョ櫥褰曞瘑鐮�" v-decorator="[ 'password', validatorRules.password]" />
+ <a-form-item label="鐧诲綍瀵嗙爜" :labelCol="labelCol" :wrapperCol="wrapperCol" hasFeedback>
+ <a-input type="password" placeholder="璇疯緭鍏ョ櫥褰曞瘑鐮�" v-decorator="[ 'password', validatorRules.password]"/>
</a-form-item>
- <a-form-item label="纭瀵嗙爜" :labelCol="labelCol" :wrapperCol="wrapperCol" hasFeedback >
- <a-input type="password" @blur="handleConfirmBlur" placeholder="璇烽噸鏂拌緭鍏ョ櫥褰曞瘑鐮�" v-decorator="[ 'confirmpassword', validatorRules.confirmpassword]"/>
+ <a-form-item label="纭瀵嗙爜" :labelCol="labelCol" :wrapperCol="wrapperCol" hasFeedback>
+ <a-input type="password" @blur="handleConfirmBlur" placeholder="璇烽噸鏂拌緭鍏ョ櫥褰曞瘑鐮�"
+ v-decorator="[ 'confirmpassword', validatorRules.confirmpassword]"/>
</a-form-item>
</a-form>
@@ -30,113 +31,115 @@
</template>
<script>
- import {changePassword} from '@/api/api'
+import { changePassword } from '@/api/api'
- export default {
- name: "PasswordModal",
- data () {
- return {
- visible: false,
- confirmLoading: false,
- confirmDirty: false,
- validatorRules:{
- password:{
- rules: [{
+export default {
+ name: 'PasswordModal',
+ data() {
+ return {
+ visible: false,
+ confirmLoading: false,
+ confirmDirty: false,
+ validatorRules: {
+ password: {
+ rules: [
+ {
required: true,
- pattern:/^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,
- message: '瀵嗙爜鐢�8浣嶆暟瀛椼�佸ぇ灏忓啓瀛楁瘝鍜岀壒娈婄鍙风粍鎴�!'
- }, {
- validator: this.validateToNextPassword,
- }],
- },
- confirmpassword:{
- rules: [{
- required: true, message: '璇烽噸鏂拌緭鍏ョ櫥褰曞瘑鐮�!',
- }, {
- validator: this.compareToFirstPassword,
- }],
- },
+ // pattern:/^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,
+ message: '璇疯緭鍏ョ櫥褰曞瘑鐮�!'
+ },
+ {
+ validator: this.validateToNextPassword
+ }]
},
+ confirmpassword: {
+ rules: [{
+ required: true, message: '璇烽噸鏂拌緭鍏ョ櫥褰曞瘑鐮�!'
+ }, {
+ validator: this.compareToFirstPassword
+ }]
+ }
+ },
- model: {},
+ model: {},
- labelCol: {
- xs: { span: 24 },
- sm: { span: 5 },
- },
- wrapperCol: {
- xs: { span: 24 },
- sm: { span: 16 },
- },
- form:this.$form.createForm(this)
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 5 }
+ },
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 16 }
+ },
+ form: this.$form.createForm(this)
+ }
+ },
+ created() {
+ console.log('created')
+ },
+
+ methods: {
+ show(username) {
+ this.form.resetFields()
+ this.visible = true
+ this.model.username = username
+ this.$nextTick(() => {
+ this.form.setFieldsValue({ username: username })
+ })
+ },
+ close() {
+ this.$emit('close')
+ this.visible = false
+ this.disableSubmit = false
+ this.selectedRole = []
+ },
+ handleSubmit() {
+ // 瑙﹀彂琛ㄥ崟楠岃瘉
+ this.form.validateFields((err, values) => {
+ if (!err) {
+ this.confirmLoading = true
+ let formData = Object.assign(this.model, values)
+ changePassword(formData).then((res) => {
+ if (res.success) {
+ this.$message.success(res.message)
+ this.$emit('ok')
+ } else {
+ this.$message.warning(res.message)
+ }
+ }).finally(() => {
+ this.confirmLoading = false
+ this.close()
+ })
+ }
+ })
+ },
+ handleCancel() {
+ this.close()
+ },
+ validateToNextPassword(rule, value, callback) {
+ const form = this.form
+ const confirmpassword = form.getFieldValue('confirmpassword')
+ console.log('confirmpassword==>', confirmpassword)
+ if (value && confirmpassword && value !== confirmpassword) {
+ callback('涓ゆ杈撳叆鐨勫瘑鐮佷笉涓�鏍凤紒')
+ }
+ if (value && this.confirmDirty) {
+ form.validateFields(['confirm'], { force: true })
+ }
+ callback()
+ },
+ compareToFirstPassword(rule, value, callback) {
+ const form = this.form
+ if (value && value !== form.getFieldValue('password')) {
+ callback('涓ゆ杈撳叆鐨勫瘑鐮佷笉涓�鏍凤紒')
+ } else {
+ callback()
}
},
- created () {
- console.log("created");
- },
-
- methods: {
- show (username) {
- this.form.resetFields();
- this.visible = true;
- this.model.username = username;
- this.$nextTick(() => {
- this.form.setFieldsValue({username:username});
- });
- },
- close () {
- this.$emit('close');
- this.visible = false;
- this.disableSubmit = false;
- this.selectedRole = [];
- },
- handleSubmit () {
- // 瑙﹀彂琛ㄥ崟楠岃瘉
- this.form.validateFields((err, values) => {
- if (!err) {
- this.confirmLoading = true;
- let formData = Object.assign(this.model, values);
- changePassword(formData).then((res)=>{
- if(res.success){
- this.$message.success(res.message);
- this.$emit('ok');
- }else{
- this.$message.warning(res.message);
- }
- }).finally(() => {
- this.confirmLoading = false;
- this.close();
- });
- }
- })
- },
- handleCancel () {
- this.close()
- },
- validateToNextPassword (rule, value, callback) {
- const form = this.form;
- const confirmpassword=form.getFieldValue('confirmpassword');
- console.log("confirmpassword==>",confirmpassword);
- if (value && confirmpassword && value !== confirmpassword) {
- callback('涓ゆ杈撳叆鐨勫瘑鐮佷笉涓�鏍凤紒');
- }
- if (value && this.confirmDirty) {
- form.validateFields(['confirm'], { force: true })
- }
- callback();
- },
- compareToFirstPassword (rule, value, callback) {
- const form = this.form;
- if (value && value !== form.getFieldValue('password')) {
- callback('涓ゆ杈撳叆鐨勫瘑鐮佷笉涓�鏍凤紒');
- } else {
- callback()
- }
- },
- handleConfirmBlur (e) {
- const value = e.target.value
- this.confirmDirty = this.confirmDirty || !!value
- }
+ handleConfirmBlur(e) {
+ const value = e.target.value
+ this.confirmDirty = this.confirmDirty || !!value
}
}
+}
</script>
\ No newline at end of file
--
Gitblit v1.9.3