Commit 9a8cee55 authored by jiaxu.yan's avatar jiaxu.yan

fix: 70833

parent 6fe60adb
...@@ -102,7 +102,18 @@ export default { ...@@ -102,7 +102,18 @@ export default {
{ required: true, trigger: 'blur', message: '请输入您的账号' } { required: true, trigger: 'blur', message: '请输入您的账号' }
], ],
password: [ password: [
{ required: true, trigger: 'blur', message: '请输入您的密码' } { required: true, trigger: 'blur', message: '请输入您的密码' },
{
validator: (rule, value, callback) => {
const pattern = /^(?=.*\d)(?=.*[a-zA-Z])(?=.*[^\da-zA-Z]).{8,}$/
if (!pattern.test(value)) {
callback(new Error('字段必须包含数字、字母和英文字符'))
} else {
callback()
}
},
trigger: 'blur'
}
], ],
code: [{ required: true, trigger: 'change', message: '请输入验证码' }] code: [{ required: true, trigger: 'change', message: '请输入验证码' }]
}, },
......
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
</div> </div>
</div> </div>
<div class="standard-result"> <div class="standard-result">
<el-button type="text" @click="testmMthod" <el-button type="text" @click="testmMthod(item)"
>标准测试方法</el-button >标准测试方法</el-button
> >
</div> </div>
...@@ -140,6 +140,7 @@ ...@@ -140,6 +140,7 @@
</div> </div>
</div> </div>
<el-dialog title="标准测试方法" :visible.sync="open" append-to-body> <el-dialog title="标准测试方法" :visible.sync="open" append-to-body>
{{ activeValue }}
</el-dialog> </el-dialog>
</task-standard> </task-standard>
</template> </template>
...@@ -169,7 +170,8 @@ export default { ...@@ -169,7 +170,8 @@ export default {
detailsList: [] detailsList: []
}, },
task: {}, task: {},
loading: false loading: false,
activeValue: ''
} }
}, },
mounted() { mounted() {
...@@ -194,8 +196,9 @@ export default { ...@@ -194,8 +196,9 @@ export default {
closeAll() { closeAll() {
this.activeNames = [] this.activeNames = []
}, },
testmMthod() { testmMthod(i) {
this.open = true this.open = true
this.activeValue = i.testMethod
}, },
getTest() { getTest() {
getBySubtaskId({ id: this.$route.query.id }).then(res => { getBySubtaskId({ id: this.$route.query.id }).then(res => {
......
...@@ -779,8 +779,9 @@ export default { ...@@ -779,8 +779,9 @@ export default {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
closeOnClickModal: false, closeOnClickModal: false,
inputPattern: /^.{6,20}$/, inputPattern: /^(?=.*\d)(?=.*[a-zA-Z])(?=.*[^\da-zA-Z]).{6,20}$/,
inputErrorMessage: '用户密码长度必须介于 6 和 20 之间' inputErrorMessage:
'用户密码必须包含数字、字母和英文字符,长度必须介于 6 和 20 之间'
}) })
.then(({ value }) => { .then(({ value }) => {
resetUserPwd(row.userId, value).then(response => { resetUserPwd(row.userId, value).then(response => {
......
...@@ -56,7 +56,23 @@ export default { ...@@ -56,7 +56,23 @@ export default {
], ],
newPassword: [ newPassword: [
{ required: true, message: '新密码不能为空', trigger: 'blur' }, { required: true, message: '新密码不能为空', trigger: 'blur' },
{ min: 6, max: 20, message: '长度在 6 到 20 个字符', trigger: 'blur' } {
min: 6,
max: 20,
message: '长度在 6 到 20 个字符',
trigger: 'blur'
},
{
validator: (rule, value, callback) => {
const pattern = /^(?=.*\d)(?=.*[a-zA-Z])(?=.*[^\da-zA-Z]).{8,}$/
if (!pattern.test(value)) {
callback(new Error('字段必须包含数字、字母和英文字符'))
} else {
callback()
}
},
trigger: 'blur'
}
], ],
confirmPassword: [ confirmPassword: [
{ required: true, message: '确认密码不能为空', trigger: 'blur' }, { required: true, message: '确认密码不能为空', trigger: 'blur' },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment