Merge branch 'master' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into master-v32-xwx
Showing
8 changed files
with
17 additions
and
16 deletions
| @@ -469,7 +469,7 @@ layui.extend({ | @@ -469,7 +469,7 @@ layui.extend({ | ||
| 469 | new msgTips({ | 469 | new msgTips({ |
| 470 | dom: ".right-bottom-tips", | 470 | dom: ".right-bottom-tips", |
| 471 | title: title, | 471 | title: title, |
| 472 | - 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>`, | 472 | + 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>`, |
| 473 | duration: 10000, | 473 | duration: 10000, |
| 474 | space: 10, | 474 | space: 10, |
| 475 | firstSpace: 8, | 475 | firstSpace: 8, |
| @@ -487,6 +487,7 @@ layui.extend({ | @@ -487,6 +487,7 @@ layui.extend({ | ||
| 487 | //} | 487 | //} |
| 488 | } | 488 | } |
| 489 | }) | 489 | }) |
| 490 | + debugger | ||
| 490 | }, delay); | 491 | }, delay); |
| 491 | }else{ | 492 | }else{ |
| 492 | setTimeout(function () { | 493 | setTimeout(function () { |
| @@ -127,7 +127,7 @@ layui.define(['layer', 'laytpl', 'form'], function (exports) { | @@ -127,7 +127,7 @@ layui.define(['layer', 'laytpl', 'form'], function (exports) { | ||
| 127 | $(newContainer).css({ | 127 | $(newContainer).css({ |
| 128 | 'transition-timing-function':options.timingFun, | 128 | 'transition-timing-function':options.timingFun, |
| 129 | // 'width':options.width, | 129 | // 'width':options.width, |
| 130 | - 'width':'226px', | 130 | + 'width':'240px', |
| 131 | 'bottom':'350px' | 131 | 'bottom':'350px' |
| 132 | }); | 132 | }); |
| 133 | var height = $(newContainer).outerHeight(true); | 133 | var height = $(newContainer).outerHeight(true); |
| @@ -202,7 +202,7 @@ export default { | @@ -202,7 +202,7 @@ export default { | ||
| 202 | 202 | ||
| 203 | let getTextContent = (val) =>{ | 203 | let getTextContent = (val) =>{ |
| 204 | if(val && val != '' && val != null){ | 204 | if(val && val != '' && val != null){ |
| 205 | - val = val.replace(/[^\x00-\xff]/g,"$&\x01").replace(/.{50}\x01?/g,"$&<br/>").replace(/\x01/g,""); | 205 | + val = val+''.replace(/[^\x00-\xff]/g,"$&\x01").replace(/.{50}\x01?/g,"$&<br/>").replace(/\x01/g,""); |
| 206 | } | 206 | } |
| 207 | return val; | 207 | return val; |
| 208 | 208 |
| @@ -297,7 +297,7 @@ export default { | @@ -297,7 +297,7 @@ export default { | ||
| 297 | var re1=/^0\d{2}-[1-9]\d{7}$/; | 297 | var re1=/^0\d{2}-[1-9]\d{7}$/; |
| 298 | var re2=/^0\d{3}-[1-9]\{6,7}$/; | 298 | var re2=/^0\d{3}-[1-9]\{6,7}$/; |
| 299 | var result=re1.test(value)||re2.test(value); | 299 | var result=re1.test(value)||re2.test(value); |
| 300 | - if (!result) { | 300 | + if (!result && value) { |
| 301 | return callback(new Error('请输入正确的座机号！')) | 301 | return callback(new Error('请输入正确的座机号！')) |
| 302 | }else{ | 302 | }else{ |
| 303 | callback() | 303 | callback() |
| @@ -329,7 +329,8 @@ export default { | @@ -329,7 +329,8 @@ export default { | ||
| 329 | var reg = new RegExp("^[a-z0-9]+([._\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$"); //正则表达式 | 329 | var reg = new RegExp("^[a-z0-9]+([._\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$"); //正则表达式 |
| 330 | var obj = document.getElementById("email"); //要验证的对象 | 330 | var obj = document.getElementById("email"); //要验证的对象 |
| 331 | if(obj.value === ""){ //输入不能为空 | 331 | if(obj.value === ""){ //输入不能为空 |
| 332 | - return callback(new Error('邮箱不能为空！')); | 332 | + //return callback(new Error('邮箱不能为空！')); |
| 333 | + callback() | ||
| 333 | }else if(!reg.test(obj.value)){ //正则验证不通过，格式不对 | 334 | }else if(!reg.test(obj.value)){ //正则验证不通过，格式不对 |
| 334 | return callback(new Error('邮箱格式不正确！')); | 335 | return callback(new Error('邮箱格式不正确！')); |
| 335 | }else{ | 336 | }else{ |
| @@ -351,25 +352,22 @@ export default { | @@ -351,25 +352,22 @@ export default { | ||
| 351 | */ | 352 | */ |
| 352 | let rules=Vue.ref({ | 353 | let rules=Vue.ref({ |
| 353 | nickname: [ | 354 | nickname: [ |
| 354 | - {required: true, message: '请输入姓名', trigger: 'blur' } | ||
| 355 | - ], | ||
| 356 | - tel: [ | ||
| 357 | - {required: true, validator: checkTel, trigger: 'blur' } | 355 | + { message: '请输入姓名', trigger: 'blur' } |
| 358 | ], | 356 | ], |
| 359 | phone: [ | 357 | phone: [ |
| 360 | - {required: true, validator: checkPhone, trigger: 'blur' } | 358 | + { validator: checkPhone, trigger: 'blur' } |
| 361 | ], | 359 | ], |
| 362 | email: [ | 360 | email: [ |
| 363 | - {required: true, validator: checkEmail, trigger: 'blur' } | 361 | + { validator: checkEmail, trigger: 'blur' } |
| 364 | ], | 362 | ], |
| 365 | company: [ | 363 | company: [ |
| 366 | - {required: true, message:'请输入所在公司', trigger: 'blur' } | 364 | + { message:'请输入所在公司', trigger: 'blur' } |
| 367 | ], | 365 | ], |
| 368 | idcard: [ | 366 | idcard: [ |
| 369 | - {required: true, validator:checkIdCard,message:'请输入身份证号', trigger: 'blur' } | 367 | + { validator:checkIdCard,message:'请输入身份证号', trigger: 'blur' } |
| 370 | ], | 368 | ], |
| 371 | entryTime: [ | 369 | entryTime: [ |
| 372 | - { required: true, message: '请选择入职时间', trigger: 'blur' }, | 370 | + { message: '请选择入职时间', trigger: 'blur' }, |
| 373 | ], | 371 | ], |
| 374 | }); | 372 | }); |
| 375 | 373 | ||
| @@ -380,6 +378,7 @@ export default { | @@ -380,6 +378,7 @@ export default { | ||
| 380 | */ | 378 | */ |
| 381 | // 保存用户信息 | 379 | // 保存用户信息 |
| 382 | let saveUser = () => { | 380 | let saveUser = () => { |
| 381 | + debugger | ||
| 383 | proxy.$refs.rule.validate((valid) => { | 382 | proxy.$refs.rule.validate((valid) => { |
| 384 | if (valid) { | 383 | if (valid) { |
| 385 | console.log('submit!!'); | 384 | console.log('submit!!'); |
| @@ -14,7 +14,8 @@ | @@ -14,7 +14,8 @@ | ||
| 14 | <div style="width: calc(100% - 100px)"> | 14 | <div style="width: calc(100% - 100px)"> |
| 15 | <el-form :inline="true" :model="searchForm" class="demo-form-inline"> | 15 | <el-form :inline="true" :model="searchForm" class="demo-form-inline"> |
| 16 | <el-form-item v-for="searchInfo in obj.searchList" :label="searchInfo.name"> | 16 | <el-form-item v-for="searchInfo in obj.searchList" :label="searchInfo.name"> |
| 17 | - <el-input v-model="searchForm[searchInfo.key]" placeholder="请输入资源名称"></el-input> | 17 | + <el-input v-if="searchInfo.type == 'INPUT'" v-model="searchForm[searchInfo.key]" :placeholder="'请输入' + searchInfo.name"></el-input> |
| 18 | + <el-input v-else v-model="searchForm[searchInfo.key]" :placeholder="'请输入' + searchInfo.name"></el-input> | ||
| 18 | </el-form-item> | 19 | </el-form-item> |
| 19 | 20 | ||
| 20 | <el-form-item> | 21 | <el-form-item> |
| @@ -22,7 +23,7 @@ | @@ -22,7 +23,7 @@ | ||
| 22 | </el-form-item> | 23 | </el-form-item> |
| 23 | </el-form> | 24 | </el-form> |
| 24 | </div> | 25 | </div> |
| 25 | - <div style="width: 100px" v-if="$global.isAdminRole()"> | 26 | + <div style="width: 100px" v-if="$global.common.isAdminManager()"> |
| 26 | <el-button type="primary" @click="showConfigDialog(true)">配置</el-button> | 27 | <el-button type="primary" @click="showConfigDialog(true)">配置</el-button> |
| 27 | </div> | 28 | </div> |
| 28 | </div> | 29 | </div> |
-
Please register or login to post a comment