From a04b8970aa94f80c4c4937706c787391759aded7 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 13 十二月 2023 15:54:17 +0800
Subject: [PATCH] 1、全局车间层级以及部门层级树默认展开 2、车间看板页面设备详情弹窗背景透明度改为不透明 3、所有含有车间层级树页面新增弹窗中的选择设备弹窗内容由表格选择调整为树方式 4、报警分析页面表格字段出现次数与合计持续时间增加排序功能以及表格请求数据设置加载中动画 5、设备利用率、设备开动率以及班次利用率页面表格有关时间值调整为小时并保留两位小数以及通过与后端数据联调，增加表格平均值及合计值展示 6、设备综合效率分析页面表格班次字段若数据过长则省略 7、用户管理页面添加用户与重新设定密码弹窗中的登录密码校验长度与数据字典password_length设置保持一致以及表格车间字段若数据过长则省略
---
src/views/system/modules/UserModal.vue | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/src/views/system/modules/UserModal.vue b/src/views/system/modules/UserModal.vue
index d46bccf..e5ea623 100644
--- a/src/views/system/modules/UserModal.vue
+++ b/src/views/system/modules/UserModal.vue
@@ -66,6 +66,14 @@
<a-form-model-item label="杞﹂棿鍒嗛厤" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!productionDisabled">
<j-select-production v-model="model.selectedProduction" :multi="true" @back="backProductionInfo" :backProduction="true" :treeProductOpera="true"></j-select-production>
</a-form-model-item>
+ <a-form-model-item label="鐝粍鍒嗛厤" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="teamId">
+ <j-dict-select-tag
+ v-model="model.teamId"
+ :triggerChange="true"
+ dictCode="mom_base_team,name,id,del_flag = 0"
+ placeholder="璇风淮鎶ょ彮缁�"
+ ></j-dict-select-tag>
+ </a-form-model-item>
<a-form-model-item label="璐熻矗閮ㄩ棬" :labelCol="labelCol" :wrapperCol="wrapperCol" v-if="departIdShow==true">
<j-multi-select-tag
@@ -135,6 +143,7 @@
import { duplicateCheck } from '@/api/api'
import JSelectProduction from '../../../components/jeecgbiz/JSelectProduction'
import {mapActions} from 'vuex'
+ import { ajaxGetDictItems, getDictItemsFromCache } from '@/api/api'
export default {
name: "UserModal",
@@ -166,7 +175,9 @@
roles:{},
workNo:[ { required: true, message: '璇疯緭鍏ュ伐鍙�' },
{ validator: this.validateWorkNo }],
- telephone: [{ pattern: /^0\d{2,3}-[1-9]\d{6,7}$/, message: '璇疯緭鍏ユ纭殑搴ф満鍙风爜' },]
+ telephone: [{ pattern: /^0\d{2,3}-[1-9]\d{6,7}$/, message: '璇疯緭鍏ユ纭殑搴ф満鍙风爜' },],
+ teamId:[ { required: true, message: '璇风淮鎶ょ彮缁�' }]
+
},
departIdShow:false,
title:"鎿嶄綔",
@@ -198,6 +209,13 @@
nextProductionOptions:[],
isDepartType:'',
+ }
+ },
+ watch:{
+ visible:{
+ handler(value){
+ if(value) this.initDictData('password_length')
+ }
}
},
created () {
@@ -531,7 +549,22 @@
}else{
this.departIdShow=true;
}
- }
+ },
+ 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[0]={
+ required:true,
+ pattern: regExp,
+ message: `瀵嗙爜鐢�${res.result[0].value}浣嶆暟瀛椼�佸ぇ灏忓啓瀛楁瘝鍜岀壒娈婄鍙风粍鎴�!`,
+ }
+
+ }
+ })
+ },
}
}
</script>
--
Gitblit v1.9.3