monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by xwx
Commit 16ed9f2cb5876f7ba85753b953c7473d5eec6598 2 parents 1ce4348c a0e4f856

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

Inline Side-by-side
Showing 12 changed files with 54 additions and 47 deletions
... ... @@ -661,7 +661,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
if(res.data && res.data.length > 0){
$.each(res.data,function (i,v){
trs += `<tr><td>${i+1}</td><td>${v.resName}</td><td>${v.ip}</td><td>${v.adminName}</td>
<td>${v.resTypeName}</td><td><span id="${v.relId}" class="link resource_sublist_del">删除</span></td></tr>`;
<td>${v.resTypeName}</td><td>${v.collProtocol}</td><td><span id="${v.relId}" class="link resource_sublist_del">删除</span></td></tr>`;
});
}
... ... @@ -677,7 +677,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
var trs = '';
$.each(res.data,function (i,v){
trs += `<tr><td>${i+1}</td><td>${v.resName}</td><td>${v.ip}</td><td>${v.adminName}</td>
<td>${v.resTypeName}</td><td><span id="${v.relId}" class="link resource_sublist_del">删除</span></td></tr>`;
<td>${v.resTypeName}</td><td>${v.collProtocol}</td><td><span id="${v.relId}" class="link resource_sublist_del">删除</span></td></tr>`;
});
var tb = `
<form class="layui-form layui-card-header layuiadmin-card-header-auto" lay-filter="dyglTools-form">
... ... @@ -685,7 +685,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
<div class="layui-inline">
<div class="layui-input-inline layui-input-inline--long">
<input type="text" id="condition-resType-keyword" placeholder="输入名称，回车搜索" autocomplete="off"
lay-tips="关键字检索包含： </br>IP地址</br>资源名称</br>负责人"
lay-tips="关键字检索包含： </br>IP地址</br>资源名称</br>负责人</br>采集协议"
class="layui-input">
</div>
<div class="layui-input-inline layui-input-inline--long multi-query" id="dyglResListBusType">
... ... @@ -699,7 +699,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
<table class="layui-table">
<thead>
<tr> <th>序号</th><th>资源名称</th><th>IP地址</th><th>负责人</th><th>资源类型</th><th>操作</th></tr>
<tr> <th>序号</th><th>资源名称</th><th>IP地址</th><th>负责人</th><th>资源类型</th><th>采集协议</th><th>操作</th></tr>
</thead>
<tbody> ${trs} </tbody>
</table>
... ...
... ... @@ -458,20 +458,16 @@ layui.extend({
imgUrl="/src/style/img/fault.png";
}
if(toastType=='faultprogress'){
imgUrl="/src/style/img/faultprogress.png";
imgUrl="/src/style/img/faultover.png";
}
if(toastType=='faultover'){
imgUrl="/src/style/img/faultover.png";
imgUrl="/src/style/img/faultprogress.png";
}
setTimeout(function () {
new msgTips({
dom: ".right-bottom-tips",
title: title,
message: `<p style="line-height: 24px;background: url(${imgUrl}) no-repeat;background-size: 100%;height: 160px;padding: 10px;background-position-x: right;padding-left: 29px;padding-top: 145px;">
<span class="title closeFault" style="position: relative;top: -75px;left: 170px;">X</span>
<span style="position: relative;left: 35px;top: -21px; font-weight: bold;">${title}</span>
${content}
</p>`,
message: `<p style="line-height: 24px;background: url(${imgUrl}) no-repeat;background-size: 100%;height: 160px;background-position-x: right;padding-left: 25px;padding-top: 145px;"><span >${content}</span><span class="title closeFault" style="position: relative;top: -126px;left: 22px;">X</span><span style="position: relative;left: -89px;top: -96px; font-weight: bold;float: right;">${title}</span></p>`,
duration: 10000,
space: 10,
firstSpace: 8,
... ... @@ -489,7 +485,6 @@ layui.extend({
//}
}
})
}, delay);
}else{
setTimeout(function () {
... ...
... ... @@ -98,7 +98,7 @@ layui.define(['layer', 'laytpl', 'form'], function (exports) {
$(options.dom).append(newContainer);
} else if(options.toastType=='faultinfo'||options.toastType=='faultprogress'||options.toastType=='faultover'){
var container = "<div class='fault_ez_tips "+options.toastType+"' style="+firstDirection+":"+options.margin+"px;transform:translateX("+minus+"110%);width: 226px;bottom: 8px !important; ></div>"
var container = "<div class='fault_ez_tips "+options.toastType+"' style="+firstDirection+":"+options.margin+"px;transform:translateX("+minus+"110%); ></div>"
// var head = "<div class='faultTitle faultClearfix'><i class='faultTips_icon_l fl'></i><i class='FaultTips_icon_r close'></i></div>";
var head = "";
... ... @@ -127,7 +127,7 @@ layui.define(['layer', 'laytpl', 'form'], function (exports) {
'transition-timing-function':options.timingFun,
// 'width':options.width,
'width':'226px',
'bottom':'8px'
'bottom':'620px'
});
var height = $(newContainer).outerHeight(true);
var len = $('.fault_ez_tips').size();
... ...
... ... @@ -21,7 +21,10 @@
<span v-else>
<el-tooltip placement="top">
<template #content> {{getTextContent(scope.row[item.prop])}}</template>
<template #content>
<div v-html="getTextContent(scope.row[item.prop])">
</div>
</template>
<div style="overflow: hidden; text-overflow: ellipsis; display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical;">
{{scope.row[item.prop]}}
</div>
... ...
... ... @@ -201,18 +201,9 @@ export default {
}
let getTextContent = (val) =>{
// if(!val){
// return val;
// }
// let arr = val.split('')
//
// let text = [];
// for(let i = 0;i < arr.length;i += 20){
// text.push(arr.slice(i, i+20))
// }
// return text.join('\n')
if(val && val != '' && val != null){
val = val.replace(/[^\x00-\xff]/g,"$&\x01").replace(/.{50}\x01?/g,"$&<br/>").replace(/\x01/g,"");
}
return val;
}
... ...
... ... @@ -10,6 +10,16 @@ var global = {};
global.layui = window.parent.layui;
global.common = {
getUserName : function (){
return localStorage.getItem('lgn');
},
getUserRole : function (){
let roleStr = sessionStorage.getItem('roles');
if(roleStr){
return roleStr.split(",");
}
return [];
}
};
... ...
... ... @@ -5,11 +5,17 @@
/* 属性配置 -- end */
.yfyw-user {
padding-top: 6px;
width: 99%;
}
.yfyw-user .el-avatar img{
width: 80px!important;
height: 80px!important;
}
.yfyw-user .title{
font-weight: bold;text-align: left;padding-left: 40px;margin-bottom: 6px
}
... ...
... ... @@ -61,8 +61,9 @@ export default {
sortable: true,
click: function (row) {
// 点击弹框展示人员信息
title.value = "人员信息";
title.value = "个人信息";
componentName.value = "USER";
props.parentNode.id = row.id;
showDialog(true);
}
}, {
... ...
<div class="yfyw-user">
<div>
<el-avatar :size="80" :src="imageUrl">
<el-avatar :size="80" :src="imageUrl" shape="circle">
<i class="iconfont icon-yonghu" style="font-size: 80px;"/>
</el-avatar>
<el-upload
... ... @@ -21,7 +21,7 @@
<el-row :gutter="5">
<el-col :span="8">
<el-form-item label="姓名" prop="nickname" class="form-class">
<el-input v-model="ruleForm.nickname" :readonly="isAdmin()"></el-input>
<el-input v-model="ruleForm.nickname" :readonly="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
... ... @@ -34,7 +34,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="年龄" prop="age" class="form-class">
<el-input v-model="ruleForm.age" type="number"></el-input>
<el-input v-model="ruleForm.age" type="number" :readonly="isAdmin()"></el-input>
</el-form-item>
</el-col>
</el-row>
... ... @@ -43,7 +43,7 @@
<el-row :gutter="5">
<el-col :span="8">
<el-form-item label="座机号码" prop="tel" class="form-class">
<el-input v-model="ruleForm.tel"></el-input>
<el-input v-model="ruleForm.tel" :readonly="isAdmin()"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
... ... @@ -53,7 +53,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="电子邮箱" prop="email" class="form-class">
<el-input v-model="ruleForm.email" id="email"></el-input>
<el-input v-model="ruleForm.email" id="email" :readonly="isAdmin()"></el-input>
</el-form-item>
</el-col>
</el-row>
... ... @@ -67,7 +67,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="学历" prop="education" class="form-class">
<el-input v-model="ruleForm.education"></el-input>
<el-input v-model="ruleForm.education" :readonly="isAdmin()"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
... ... @@ -80,7 +80,7 @@
<el-row :gutter="5">
<el-col :span="8">
<el-form-item label="身份证" prop="idcard" class="form-class">
<el-input v-model="ruleForm.idcard"></el-input>
<el-input v-model="ruleForm.idcard" :readonly="isAdmin()"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
... ... @@ -108,12 +108,12 @@
<el-row :gutter="5">
<el-col :span="8">
<el-form-item label="政治面貌" prop="politicsStatus" class="form-class">
<el-input v-model="ruleForm.politicsStatus"></el-input>
<el-input v-model="ruleForm.politicsStatus" :readonly="isAdmin()"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="在职状态" prop="certificate" :readonly="isAdmin()" class="form-class">
<el-radio-group v-model="ruleForm.state">
<el-form-item label="在职状态" prop="certificate" :readonly="true" class="form-class">
<el-radio-group v-model="ruleForm.state" :disabled="true">
<el-radio :label="1">在职</el-radio>
<el-radio :label="2">离职</el-radio>
</el-radio-group>
... ... @@ -124,18 +124,18 @@
<el-row :gutter="5">
<el-col :span="24">
<el-form-item label="获得证书" prop="post" class="form-textarea">
<el-input v-model="ruleForm.certificate" type="textarea"></el-input>
<el-input v-model="ruleForm.certificate" type="textarea" :readonly="isAdmin()"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="5">
<el-col :span="24">
<el-form-item label="家庭住址" prop="post" class="form-textarea">
<el-input v-model="ruleForm.post" type="textarea"></el-input>
<el-input v-model="ruleForm.post" type="textarea" :readonly="isAdmin()"></el-input>
</el-form-item>
</el-col>
</el-row>
<div style="text-align: center;padding-top: 10px">
<div style="text-align: center;padding-top: 10px" v-if="!isAdmin()">
<el-button type="primary" size="mini" @click="saveUser()">保存基本信息</el-button>
</div>
</el-form>
... ... @@ -173,13 +173,10 @@
</div>
</div>
<div class="zc-item-tools">
<el-button-group size="mini">
<el-button-group size="mini" v-if="!isAdmin()">
<el-button @click="btnClick('add',arr,`新建${icon[k].name}资产`)">
<i class="el-icon-plus"/>
</el-button>
<!--<el-button @click="btnClick('save',arr,`保存${icon[k].name}资产`)">
<i class="el-icon-check"/>
</el-button>-->
<el-button @click="btnClick('edit',arr,`编辑${icon[k].name}资产`)">
<i class="el-icon-edit"/>
</el-button>
... ...
... ... @@ -421,7 +421,9 @@ export default {
}
let isAdmin = () => {
return localStorage.getItem('lgn') != 'admin';
let userRoleArr = proxy.$global.common.getUserRole();
let userName = proxy.$global.common.getUserName();
return userName != 'admin' && userName != 'root' && !userRoleArr.concat('pmp');
}
const {
... ...
... ... @@ -26,6 +26,8 @@
<cm-table-page :columns="list.columns"
:dataList="list.dataList"
:total="list.total"
:pageSizes="[10,20,50,100, 200, 300, 400]"
:pageSize="searchForm.pageSize"
@loaddata="getPageInfo"
:showIndex="true"
:showBorder="true"
... ...
... ... @@ -221,7 +221,7 @@ export default {
let searchForm = Vue.ref({
keyword: '',
page: 1,
pageSize: 10
pageSize: 20
});
// 获取URL参数
... ...