From 547aab154e85a9a89f1e320f92bd43854d10faeb Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期四, 14 十二月 2023 14:12:45 +0800
Subject: [PATCH] 1、调整车间看板页面详情弹窗描述列表内容字段 2、报警分析页面在原有表格中为每个报警号增加子表格，内容为出现此报警号的设备ID以及报警时间等 3、报警分析页面表格请求数据设置加载中动画 4、调整设备参数阈值管理页面添加或编辑阈值上下限输入框为数字输入框，避免上下限数字比较大小时出现问题
---
src/views/system/modules/UserModal.vue | 46 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 43 insertions(+), 3 deletions(-)
diff --git a/src/views/system/modules/UserModal.vue b/src/views/system/modules/UserModal.vue
index d46bccf..a3f875e 100644
--- a/src/views/system/modules/UserModal.vue
+++ b/src/views/system/modules/UserModal.vue
@@ -66,7 +66,22 @@
<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" prop="areaId">
+ <j-dict-select-tag
+ v-model="model.areaId"
+ :triggerChange="true"
+ dictCode="mom_base_area,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
:disabled="disableSubmit"
@@ -135,6 +150,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 +182,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 +216,13 @@
nextProductionOptions:[],
isDepartType:'',
+ }
+ },
+ watch:{
+ visible:{
+ handler(value){
+ if(value) this.initDictData('password_length')
+ }
}
},
created () {
@@ -531,7 +556,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