monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit c1fe60a4cbb1984151612f5e4f1409be40e921f8 2 parents 7397828c 55024fb8

Merge branch 'master-500-dev-lushangqing' into 'master-500-dev' 

937 【资源管理】端口侦测页面需要优化 #1



See merge request !707
Inline Side-by-side
Showing 11 changed files with 50 additions and 56 deletions
... ... @@ -37,6 +37,11 @@ layui.define(['table', 'layer', 'laytpl', 'common', 'sessions', 'admin'], functi
}
});
//lsq 用户授权页增加搜索按钮 2022-06-30
$('#userListQueryBtn').unbind('click').on('click', function () {
reloadUserListTable();
return false;
})
var tableCols = [[{
type: 'checkbox'
}, {
... ...
<title>角色配置</title>
<article class="page-container">
<div class="page-panel">
<div class="main">
<div class="main commonDiv">
<div class="layui-card">
<div class="layui-card-header">
<div class="layui-status search_panel">
... ... @@ -15,12 +15,11 @@
<input class="layui-input" type="hidden">
</div>
</div>
<div class="layui-inline">
<button class="layui-btn layui-btn-normal" id="confRoleQueryBtn" type="button"><i
class="layui-icon layui-icon-search"></i>查询
<button class="layui-btn layui-btn-normal" id="confRoleQueryBtn" type="button">
<!--lsq 查询按钮取消掉图标 2022-06-30-->
查询
</button>
</div>
</div>
<button class="hide" id="btn-confRolePower-submit" lay-filter="btn-confRolePower-submit"
lay-submit>提交
</button>
... ...
<title>系统参数配置</title>
<article class="page-container">
<div class="page-panel">
<div class="main">
<div class="main commonDiv">
<div class="layui-card">
<div class="layui-card-header">
<div class="layui-status search_panel">
... ... @@ -17,12 +17,11 @@
<button class="layui-btn" id="confSearchBtn" style="display: none;">搜索</button>
</div>
</div>
<div class="layui-inline">
<button class="layui-btn layui-btn-normal" id="confQueryBtn" type="button"><i
class="layui-icon layui-icon-search"></i>查询
<button class="layui-btn layui-btn-normal" id="confQueryBtn" type="button">
<!--lsq 查询按钮取消掉图标 2022-06-30-->
查询
</button>
</div>
</div>
</form>
</div>
</div>
... ...
<title>菜单管理</title>
<article class="page-container">
<div class="page-panel">
<div class="main">
<div class="main commonDiv">
<div class="layui-card">
<div class="layui-card-header">
<div class="layui-status search_panel">
... ... @@ -16,12 +16,11 @@
<button class="layui-btn" id="menuSearchBtn" style="display: none;">搜索</button>
</div>
</div>
<div class="layui-inline">
<button class="layui-btn layui-btn-normal" id="menuQueryBtn" type="button"><i
class="layui-icon layui-icon-search"></i>查询
<button class="layui-btn layui-btn-normal" id="menuQueryBtn" type="button">
<!--lsq 查询按钮取消掉图标 2022-06-30-->
查询
</button>
</div>
</div>
</form>
</div>
</div>
... ...
<title>部门管理</title>
<article class="page-container">
<div class="page-panel">
<div class="main">
<div class="main commonDiv">
<div class="layui-card">
<div class="layui-card-header">
<div class="layui-status search_panel">
... ... @@ -17,12 +17,11 @@
<button class="layui-btn" id="orgSearchBtn" style="display: none;">搜索</button>
</div>
</div>
<div class="layui-inline">
<button class="layui-btn layui-btn-normal" id="orgQueryBtn" type="button"><i
class="layui-icon layui-icon-search"></i>查询
<button class="layui-btn layui-btn-normal" id="orgQueryBtn" type="button">
<!--lsq 查询按钮取消掉图标 2022-06-30-->
查询
</button>
</div>
</div>
</form>
</div>
</div>
... ...
<title>功能点配置</title>
<article class="page-container">
<div class="page-panel">
<div class="main">
<div class="main commonDiv">
<div class="layui-card">
<div class="layui-card-header persearchHeader">
<div class="layui-status search_panel">
... ... @@ -31,12 +31,11 @@
</select>
</div>
</div>
<div class="layui-inline">
<button class="layui-btn layui-btn-normal" id="perQueryBtn" type="button"><i
class="layui-icon layui-icon-search"></i>查询
<button class="layui-btn layui-btn-normal" id="perQueryBtn" type="button">
<!--lsq 查询按钮取消掉图标 2022-06-30-->
查询
</button>
</div>
</div>
</form>
</div>
</div>
... ...
<title>角色配置</title>
<article class="page-container">
<div class="page-panel">
<div class="main">
<div class="main commonDiv">
<div class="layui-card">
<div class="layui-card-header">
<div class="layui-status search_panel">
... ... @@ -15,12 +15,11 @@
<input class="layui-input" type="hidden">
</div>
</div>
<div class="layui-inline">
<button class="layui-btn layui-btn-normal" id="roleQueryBtn" type="button"><i
class="layui-icon layui-icon-search"></i>查询
<button class="layui-btn layui-btn-normal" id="roleQueryBtn" type="button">
<!--lsq 查询按钮取消掉图标 2022-06-30-->
查询
</button>
</div>
</div>
</form>
</div>
</div>
... ...
... ... @@ -25,9 +25,9 @@
</div>
<!--start lsq 搜索按钮位置调整 2022-06-07-->
<div class="layui-form-item" style="display: flex;align-items: center;">
<label class="layui-form-label">用户绑定</label>
<label class="layui-form-label" style="height:40px;">用户绑定</label>
<!-- <div class="layui-input-block tags-input" style="height: auto">-->
<div class=" tags-input" style="height: auto">
<div class=" tags-input" style="height: auto;">
<div class="tags" id="selecte_usergroup_id_user"></div>
</div>
<!-- style="padding: 0!important;position: relative;top: -28px;left: 98%"【-->
... ... @@ -41,6 +41,6 @@
</article>
<script>
layui.use('usergroupAdd', function (fn) {
ffn({{ d }});
fn({{ d }});
});
</script>
... ...
<title>人员分组</title>
<article class="page-container">
<div class="page-panel">
<div class="main">
<div class="main commonDiv">
<div class="layui-card">
<div class="layui-card-header">
<div class="layui-status">
... ... @@ -14,12 +14,11 @@
placeholder="输入关键字，回车搜索" type="text">
</div>
</div>
<div class="layui-inline">
<button class="layui-btn layui-btn-normal" id="userGroupQueryBtn" type="button"><i
class="layui-icon layui-icon-search"></i>查询
<button class="layui-btn layui-btn-normal" id="userGroupQueryBtn" type="button">
<!--lsq 查询按钮取消掉图标 2022-06-30-->
查询
</button>
</div>
</div>
</form>
</div>
</div>
... ...
<title>授权</title>
<article class="page-container">
<div class="page-panel">
<div class="main">
<div class="main commonDiv">
<div class="layui-card">
<div class="layui-card-header">
<div class="layui-status">
... ... @@ -14,6 +14,10 @@
type="text">
</div>
</div>
<!--lsq 增加查询按钮 2022-06-30-->
<button class="layui-btn layui-btn-normal" id="userListQueryBtn" type="button">
查询
</button>
</div>
</form>
</div>
... ...
... ... @@ -7,29 +7,21 @@
<div class="flex-div-start margin-top-bottom-10">
<el-tooltip>
<template #content>关键字检索包含<br/>资源名称<br/>IP地址</template>
<el-input :size="$global.elementConfig.size.input" class="margin-right-10" clearable
<el-input :size="$global.elementConfig.size.input" clearable
placeholder="输入关键字"
style="width:160px;margin-left: 10px;float: left;"
style="width:160px;margin-left: 10px;float: left;margin-right:6px;"
v-model="keyWords"/>
</el-input>
</el-tooltip>
<el-dropdown style="margin-top: -15px;margin-left: 10px;float: left;">
<el-icon class="el-icon--right">
<arrow-down/>
</el-icon>
<div style="margin-right:6px;">
<cm-biz-type-tree-input @callback="getBizType" clearable collapseTags multiple/>
</el-dropdown>
<el-dropdown style="margin-top: -15px;margin-left: 10px;float: left;">
<el-icon class="el-icon--right">
<arrow-down/>
</el-icon>
</div>
<div>
<cm-res-type-tree-input @callback="getResType" clearable collapseTags multiple/>
</el-dropdown>
</div>
<div class="flex-div-start" style="float: left;">
<!-- <el-button type="primary" @click="onReset()">重置</el-button>-->
<el-button :size="$global.elementConfig.size.button" @click="onBtnSearch()" style="margin-left: 10px" type="primary">查询
<el-button :size="$global.elementConfig.size.button" @click="onBtnSearch()" style="margin-left: 6px" type="primary">查询
</el-button>
</div>
... ... @@ -42,11 +34,11 @@
<el-button @click="deleteOther()" style="margin-left: 10px" type="primary">删除</el-button>
</div>
</el-row>
<el-row class="margin-bottom-50">
<el-row class="margin-bottom-50" style="padding:0 10px;">
<el-col :span="24" class="table-height">
<cm-table-page :columns="columns"
:dataList="portSenseData"
:height="(height - 150)"
:height="(height - 190)"
:loading="loading"
:pageSize="pageSize"
:showBorder="true"
... ...