From 8c168889e5ef37b4d334827108615e762511c622 Mon Sep 17 00:00:00 2001 From: zhuzhuanzhuan Date: 星期二, 26 十二月 2023 11:39:25 +0800 Subject: [PATCH] 1、根页面网站标题由统计分析调整为MDC智慧车间 2、车间看板页面优化代码,去除冗余代码,试图解决新增车间后设备无法自由拖拽问题(未在现场调试,本地调试无问题) 3、车间看板页面全屏模式进入车间后车间背景图无法正常计算高度 4、车间看板与设备监控页面设备详情弹窗调整数据过长则省略的判定条件 5、首页优化布局方式,实现响应式布局 --- src/views/system/modules/PasswordModal.vue | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 deletions(-) diff --git a/src/views/system/modules/PasswordModal.vue b/src/views/system/modules/PasswordModal.vue index f9f897e..810cc5f 100644 --- a/src/views/system/modules/PasswordModal.vue +++ b/src/views/system/modules/PasswordModal.vue @@ -31,6 +31,7 @@ <script> import {changePassword} from '@/api/api' + import { ajaxGetDictItems, getDictItemsFromCache } from '@/api/api' export default { name: "PasswordModal", @@ -69,6 +70,13 @@ sm: { span: 16 }, }, form:this.$form.createForm(this) + } + }, + watch:{ + visible:{ + handler(value){ + if(value) this.initDictData('password_length') + } } }, created () { @@ -136,7 +144,20 @@ handleConfirmBlur (e) { const value = e.target.value this.confirmDirty = this.confirmDirty || !!value - } + }, + initDictData(dictCode) { + //鏍规嵁瀛楀吀Code, 鍒濆鍖栧瓧鍏告暟缁� + ajaxGetDictItems(dictCode, null).then((res) => { + if (res.success) { + const regExp = new RegExp("^(?=.*[a-zA-Z])(?=.*\\\d)(?=.*[~!@#$%^&*()_+`\\-={}:\";'<>?,./]).{"+Number(res.result[0].value)+",}$"); + this.validatorRules.password.rules[0]={ + required:true, + pattern: regExp, + message: `瀵嗙爜鐢�${res.result[0].value}浣嶆暟瀛椼�佸ぇ灏忓啓瀛楁瘝鍜岀壒娈婄鍙风粍鎴�!`, + } + } + }) + }, } } </script> \ No newline at end of file -- Gitblit v1.9.3