Authored by xwx

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

... ... @@ -469,7 +469,7 @@ layui.extend({
new msgTips({
dom: ".right-bottom-tips",
title: title,
message: `<p style="line-height: 20px;background: url(${imgUrl}) no-repeat;background-size: 100%;height: 160px;background-position-x: right;padding-left: 25px;padding-top: 145px;" ><span style=" overflow: hidden; text-overflow: ellipsis; display: -webkit-box; -webkit-line-clamp: 5; -webkit-box-orient: vertical;margin-left: -11px;" lay-tips="${content}">${content}</span><span class="title closeFault" style="position: absolute;top: 72px;left: 213px;">X</span><span style="position: absolute;left: 87px;top: 124px; font-weight: bold;float: right;">${title}</span></p>`,
message: `<p style="line-height: 18px;background: url(${imgUrl}) no-repeat;background-size: 100%;height: 160px;background-position-x: right;padding: 145px 22px 0; "><span style=" overflow: hidden; text-overflow: ellipsis; display: -webkit-box; -webkit-line-clamp: 4; -webkit-box-orient: vertical;" lay-tips="${content}">${content}</span><span class="title closeFault" style="position: absolute;top: 66px;left: 214px;">X</span><span style="position: absolute;left: 87px;top: 124px; font-weight: bold;float: right;">${title}</span></p>`,
duration: 10000,
space: 10,
firstSpace: 8,
... ... @@ -487,6 +487,7 @@ layui.extend({
//}
}
})
debugger
}, delay);
}else{
setTimeout(function () {
... ...
... ... @@ -127,7 +127,7 @@ layui.define(['layer', 'laytpl', 'form'], function (exports) {
$(newContainer).css({
'transition-timing-function':options.timingFun,
// 'width':options.width,
'width':'226px',
'width':'240px',
'bottom':'350px'
});
var height = $(newContainer).outerHeight(true);
... ...
... ... @@ -202,7 +202,7 @@ export default {
let getTextContent = (val) =>{
if(val && val != '' && val != null){
val = val.replace(/[^\x00-\xff]/g,"$&\x01").replace(/.{50}\x01?/g,"$&<br/>").replace(/\x01/g,"");
val = val+''.replace(/[^\x00-\xff]/g,"$&\x01").replace(/.{50}\x01?/g,"$&<br/>").replace(/\x01/g,"");
}
return val;
... ...
... ... @@ -297,7 +297,7 @@ export default {
var re1=/^0\d{2}-[1-9]\d{7}$/;
var re2=/^0\d{3}-[1-9]\{6,7}$/;
var result=re1.test(value)||re2.test(value);
if (!result) {
if (!result && value) {
return callback(new Error('请输入正确的座机号!'))
}else{
callback()
... ... @@ -329,7 +329,8 @@ export default {
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('邮箱不能为空!'));
//return callback(new Error('邮箱不能为空!'));
callback()
}else if(!reg.test(obj.value)){ //正则验证不通过,格式不对
return callback(new Error('邮箱格式不正确!'));
}else{
... ... @@ -351,25 +352,22 @@ export default {
*/
let rules=Vue.ref({
nickname: [
{required: true, message: '请输入姓名', trigger: 'blur' }
],
tel: [
{required: true, validator: checkTel, trigger: 'blur' }
{ message: '请输入姓名', trigger: 'blur' }
],
phone: [
{required: true, validator: checkPhone, trigger: 'blur' }
{ validator: checkPhone, trigger: 'blur' }
],
email: [
{required: true, validator: checkEmail, trigger: 'blur' }
{ validator: checkEmail, trigger: 'blur' }
],
company: [
{required: true, message:'请输入所在公司', trigger: 'blur' }
{ message:'请输入所在公司', trigger: 'blur' }
],
idcard: [
{required: true, validator:checkIdCard,message:'请输入身份证号', trigger: 'blur' }
{ validator:checkIdCard,message:'请输入身份证号', trigger: 'blur' }
],
entryTime: [
{ required: true, message: '请选择入职时间', trigger: 'blur' },
{ message: '请选择入职时间', trigger: 'blur' },
],
});
... ... @@ -380,6 +378,7 @@ export default {
*/
// 保存用户信息
let saveUser = () => {
debugger
proxy.$refs.rule.validate((valid) => {
if (valid) {
console.log('submit!!');
... ...
... ... @@ -14,7 +14,8 @@
<div style="width: calc(100% - 100px)">
<el-form :inline="true" :model="searchForm" class="demo-form-inline">
<el-form-item v-for="searchInfo in obj.searchList" :label="searchInfo.name">
<el-input v-model="searchForm[searchInfo.key]" placeholder="请输入资源名称"></el-input>
<el-input v-if="searchInfo.type == 'INPUT'" v-model="searchForm[searchInfo.key]" :placeholder="'请输入' + searchInfo.name"></el-input>
<el-input v-else v-model="searchForm[searchInfo.key]" :placeholder="'请输入' + searchInfo.name"></el-input>
</el-form-item>
<el-form-item>
... ... @@ -22,7 +23,7 @@
</el-form-item>
</el-form>
</div>
<div style="width: 100px" v-if="$global.isAdminRole()">
<div style="width: 100px" v-if="$global.common.isAdminManager()">
<el-button type="primary" @click="showConfigDialog(true)">配置</el-button>
</div>
</div>
... ...