Merge branch 'master' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into master-V32-XuHaoJie

@@ -3479,6 +3479,12 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
                 var num = res.object?res.object.ignoreCnt:"";
                 var num = res.object?res.object.ignoreCnt:"";
                 layer.prompt({id: "kpi_press_times_id", title: '压制次数', area: ['400px'], formType: 2},
                 layer.prompt({id: "kpi_press_times_id", title: '压制次数', area: ['400px'], formType: 2},
                     function (text, index) {
                     function (text, index) {
+                        // Start Wang 2022/2/16 11:15 #298 【告警压制】测试告警压制测试过长后端是否报错
+                        if(text > 10000){
+                            layer.msg("压制次数请设置为0-10000！", { offset: '15px' , icon: 7 , time: 1000 });
+                            return;
+                        }
+                        // End Wang 2022/2/16 11:16
                         obj['ignoreCnt'] = text
                         obj['ignoreCnt'] = text
                         admin.req({
                         admin.req({
                             url : common.domainName +  '/api-web/manage/resource/res/kpi/ignore?access_token='+ layui.sessions.getToken().access_token
                             url : common.domainName +  '/api-web/manage/resource/res/kpi/ignore?access_token='+ layui.sessions.getToken().access_token

@@ -386,7 +386,7 @@ layui.define(['table', 'form', 'laydate', 'laytpl','common','sessions','xmSelect
             var lastRowCell = JSON.parse(data.lastRowCell);
             var lastRowCell = JSON.parse(data.lastRowCell);
             layer.open({
             layer.open({
                 type: '1'
                 type: '1'
-                , title: '新增sheet页'
+                , title: 'sheet页详情'
                 , btn: ["保存", "取消"]
                 , btn: ["保存", "取消"]
                 , area: ['80%', '90%']
                 , area: ['80%', '90%']
                 , shade: 0.3
                 , shade: 0.3

@@ -167,7 +167,7 @@
                     <label class="col-md-4 control-label"><button type="button" class="layui-btn layui-btn-normal" id="contentResult">获取列信息</button></label>
                     <label class="col-md-4 control-label"><button type="button" class="layui-btn layui-btn-normal" id="contentResult">获取列信息</button></label>
                 </div>
                 </div>
             </div>
             </div>
-            <div class="layui-form-item col-show-area">
+            <div class="layui-form-item col-show-area" style="height: 260px">
                 <form onsubmit="return false" id="colNameForm">
                 <form onsubmit="return false" id="colNameForm">
                     <table class="layui-table">
                     <table class="layui-table">
                         <thead>
                         <thead>

@@ -82,8 +82,8 @@ export default {
                 return arr.join(' / ')
                 return arr.join(' / ')
             }
             }
         }, {
         }, {
-            prop: 'email',
-            label: '电子邮箱',
+            prop: 'education',
+            label: '学历',
             sortable: true,
             sortable: true,
         }, {
         }, {
             prop: 'state',
             prop: 'state',

@@ -32,30 +32,13 @@
                         </el-radio-group>
                         </el-radio-group>
                     </el-form-item>
                     </el-form-item>
                 </el-col>
                 </el-col>
-                <el-col :span="8">
-                    <el-form-item label="年龄" prop="age" class="form-class">
-                        <el-input v-model="ruleForm.age" type="number" :readonly="isAdmin()"></el-input>
-                    </el-form-item>
-                </el-col>
-            </el-row>
 
 
-
-            <el-row :gutter="5">
-                <el-col :span="8">
-                    <el-form-item label="座机号码" prop="tel" class="form-class">
-                        <el-input v-model="ruleForm.tel" :readonly="isAdmin()"></el-input>
-                    </el-form-item>
-                </el-col>
                 <el-col :span="8">
                 <el-col :span="8">
                     <el-form-item label="手机号" prop="phone" class="form-class">
                     <el-form-item label="手机号" prop="phone" class="form-class">
                         <el-input v-model="ruleForm.phone" :readonly="isAdmin()"></el-input>
                         <el-input v-model="ruleForm.phone" :readonly="isAdmin()"></el-input>
                     </el-form-item>
                     </el-form-item>
                 </el-col>
                 </el-col>
-                <el-col :span="8">
-                    <el-form-item label="电子邮箱" prop="email" class="form-class">
-                        <el-input v-model="ruleForm.email" id="email" :readonly="isAdmin()"></el-input>
-                    </el-form-item>
-                </el-col>
+
             </el-row>
             </el-row>
 
 
             <el-row :gutter="5">
             <el-row :gutter="5">
@@ -88,6 +71,8 @@
                         <el-date-picker
                         <el-date-picker
                                 :readonly="isAdmin()"
                                 :readonly="isAdmin()"
                                 v-model="ruleForm.entryTime"
                                 v-model="ruleForm.entryTime"
+                                format="YYYY-MM-DD"
+                                value-format="YYYY-MM-DD HH:mm:ss"
                                 type="date"
                                 type="date"
                                 placeholder="选择日期">
                                 placeholder="选择日期">
                         </el-date-picker>
                         </el-date-picker>
@@ -98,6 +83,8 @@
                         <el-date-picker
                         <el-date-picker
                                 v-model="ruleForm.quitTime"
                                 v-model="ruleForm.quitTime"
                                 :readonly="isAdmin()"
                                 :readonly="isAdmin()"
+                                format="YYYY-MM-DD"
+                                value-format="YYYY-MM-DD HH:mm:ss"
                                 type="date"
                                 type="date"
                                 placeholder="选择日期">
                                 placeholder="选择日期">
                         </el-date-picker>
                         </el-date-picker>

@@ -247,10 +247,8 @@ export default {
 
 
         let ruleForm = Vue.ref({
         let ruleForm = Vue.ref({
             nickname: '',
             nickname: '',
-            sex: 0,
             education: '',
             education: '',
             phone: '',
             phone: '',
-            email: '',
             entryTime: '',
             entryTime: '',
             certificate: '',
             certificate: '',
             university: '',
             university: '',
@@ -261,7 +259,6 @@ export default {
             projectId: null,
             projectId: null,
             quitTime: '',
             quitTime: '',
             state: '',
             state: '',
-            tel: '',
             idcard:'',
             idcard:'',
             politicsStatus:''
             politicsStatus:''
         })
         })
@@ -311,38 +308,19 @@ export default {
          * @returns {*}
          * @returns {*}
          */
          */
         const checkPhone= (rule, tel, callback) => {
         const checkPhone= (rule, tel, callback) => {
-            var  mobile = /^1[3|5|8]\d{9}$/;
-            if (!mobile.test(tel)) {
-                return callback(new Error('请输入正确的手机号！'))
-            }else{
+            var  mobile = /^1[0-9]\d{9}$/;
+            if (tel != '' && !mobile.test(tel)) {
+                callback(new Error('请输入正确的手机号！'))
+            } else {
                 callback();
                 callback();
             }
             }
         }
         }
-        /**
-         * @Author LH
-         * @param rule
-         * @param value
-         * @param callback
-         * @returns {*}
-         */
-        const checkEmail= (rule, tel, callback) => {
-            var reg = new RegExp("^[a-z0-9]+([._\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$"); //正则表达式
-            var obj = document.getElementById("email"); //要验证的对象
-            if(obj.value === ""){ //输入不能为空
-                //return callback(new Error('邮箱不能为空！'));
-                callback()
-            }else if(!reg.test(obj.value)){ //正则验证不通过，格式不对
-                return callback(new Error('邮箱格式不正确！'));
-            }else{
-                callback()
-            }
-        }
         const  checkIdCard=(rule, idCard, callback) => {
         const  checkIdCard=(rule, idCard, callback) => {
             var pattern = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/;
             var pattern = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/;
-           if (pattern.test(idCard)) {
-               callback()
-            }else{
-               return callback(new Error('身份证校验失败！'));
+            if (idCard != '' && !pattern.test(idCard)) {
+                 callback(new Error('身份证校验失败！'));
+            } else {
+                callback();
             }
             }
         }
         }
 
 
@@ -357,18 +335,12 @@ export default {
             phone: [
             phone: [
                 { validator: checkPhone, trigger: 'blur' }
                 { validator: checkPhone, trigger: 'blur' }
             ],
             ],
-            email: [
-               { validator: checkEmail,  trigger: 'blur' }
-            ],
             company: [
             company: [
                 { message:'请输入所在公司', trigger: 'blur' }
                 { message:'请输入所在公司', trigger: 'blur' }
             ],
             ],
             idcard: [
             idcard: [
-               { validator:checkIdCard,message:'请输入身份证号', trigger: 'blur' }
-            ],
-            entryTime: [
-                {  message: '请选择入职时间', trigger: 'blur' },
-            ],
+                { validator:checkIdCard,message:'请输入正确的身份证号', trigger: 'blur'}
+            ]
         });
         });
 
 
 
 
@@ -378,21 +350,21 @@ export default {
          */
          */
             // 保存用户信息
             // 保存用户信息
         let saveUser = () => {
         let saveUser = () => {
-            proxy.$refs.rule.validate((valid) => {
-                if (valid) {
-                    console.log('submit!!');
-                    proxy.$http.post("/api-web/bOpsPerson/saveOrUpdate", ruleForm.value, function (res) {
-                        if (res && res.code == 0) {
-                            proxy.$global.showMsg('保存成功！');
-                        }
-                    });
-                } else {
-                    console.log('error submit!!');
-                    return false;
-                }
-            });
+                proxy.$refs.rule.validate((valid) => {
+                    if (valid) {
+                        console.log('submit!!');
+                        proxy.$http.post("/api-web/bOpsPerson/saveOrUpdate", ruleForm.value, function (res) {
+                            if (res && res.code == 0) {
+                                proxy.$global.showMsg('保存成功！');
+                            }
+                        });
+                    } else {
+                        console.log('error submit!!');
+                        return false;
+                    }
+                });
 
 
-        }
+            }
 
 
 
 
         let getFile = (param) => {
         let getFile = (param) => {