monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 79713e3ff65dcd5249363bb754732ef007255426 2 parents 15f338bc b8240436

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

【无】ping配置、端口侦测、路由跟踪、http配置、域配置、图标配置、任务管理-资源协议\资源授权\端口侦测，查询按钮取消掉图标,停机管理增加查询按钮 #1



See merge request !705
Inline Side-by-side
Showing 13 changed files with 55 additions and 56 deletions
... ... @@ -72,6 +72,10 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
reloadTable();
}
});
//lsq 停机管理页增加搜索按钮 2022-06-29
$('#searchShutdownplan').unbind('click').on('click', function () {
reloadTable();
})
//下拉搜索
form.on("select(shutdownplanModeSearch)", function (data) {
reloadTable();
... ...
<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,11 +15,10 @@
<input class="layui-input" style="display: none" type="text">
</div>
</div>
<div class="layui-inline">
<button class="layui-btn layui-btn-normal" id="domainQueryBtn" type="button"><i
class="layui-icon layui-icon-search"></i>查询
</button>
</div>
<button class="layui-btn layui-btn-normal" id="domainQueryBtn" type="button">
<!--lsq 查询按钮取消掉图标 2022-06-29-->
查询
</button>
</div>
</form>
</div>
... ...
<title>Http工具</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">
... ... @@ -35,11 +35,10 @@
<!-- </select>-->
<!-- </div>-->
<!-- </div>-->
<div class="layui-inline">
<button class="layui-btn layui-btn-normal" id="httpToolQueryBtn" type="button"><i
class="layui-icon layui-icon-search"></i>查询
</button>
</div>
<button class="layui-btn layui-btn-normal" id="httpToolQueryBtn" type="button">
<!--lsq 查询按钮取消掉图标 2022-06-29-->
查询
</button>
</div>
</form>
</div>
... ...
<title>Ping工具</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">
... ... @@ -35,11 +35,10 @@
</select>
</div>
</div>
<div class="layui-inline">
<button class="layui-btn layui-btn-normal" id="pingToolQueryBtn" type="button"><i
class="layui-icon layui-icon-search"></i>查询
</button>
</div>
<button class="layui-btn layui-btn-normal" id="pingToolQueryBtn" type="button">
<!--lsq 查询按钮取消掉图标 2022-06-29-->
查询
</button>
</div>
</form>
</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,11 +15,10 @@
type="text">
</div>
</div>
<div class="layui-inline">
<button class="layui-btn layui-btn-normal" id="protocolQueryBtn" type="button"><i
class="layui-icon layui-icon-search"></i>查询
</button>
</div>
<button class="layui-btn layui-btn-normal" id="protocolQueryBtn" type="button">
<!--lsq 查询按钮取消掉图标 2022-06-29-->
查询
</button>
</div>
<div class="layui-form-item">
<div class="layui-inline">
... ...
<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">
... ... @@ -28,7 +28,7 @@
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 110px">时间范围：</label>
<label class="layui-form-label" style="width: 110px;top:10px;">时间范围：</label>
<div class="layui-inline">
<div class="layui-input-inline layui-input-inline--long">
<input class="layui-input" id="shutdownplanStartTime" placeholder="开始时间"
... ... @@ -43,6 +43,9 @@
</div>
</div>
</div>
<button class="layui-btn layui-btn-normal" id="searchShutdownplan" type="button">
查询
</button>
</div>
<div class="layui-form-item">
<div class="layui-inline">
... ...
<title>Telnet工具</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">
... ... @@ -35,11 +35,10 @@
</select>
</div>
</div>
<div class="layui-inline">
<button class="layui-btn layui-btn-normal" id="telnetToolQueryBtn" type="button"><i
class="layui-icon layui-icon-search"></i>查询
</button>
</div>
<button class="layui-btn layui-btn-normal" id="telnetToolQueryBtn" type="button">
<!--lsq 查询按钮取消掉图标 2022-06-29-->
查询
</button>
</div>
</form>
</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">
... ... @@ -16,12 +16,11 @@
type="text">
</div>
</div>
<div class="layui-inline">
<button class="layui-btn layui-btn-normal" id="tracerouteToolQueryBtn"
type="button"><i
class="layui-icon layui-icon-search"></i>查询
</button>
</div>
<button class="layui-btn layui-btn-normal" id="tracerouteToolQueryBtn"
type="button">
<!--lsq 查询按钮取消掉图标 2022-06-29-->
查询
</button>
</div>
</form>
</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">
... ... @@ -44,11 +44,10 @@
<!-- </select>-->
</div>
</div>
<div class="layui-inline">
<button class="layui-btn layui-btn-normal" id="userQueryBtn" type="button"><i
class="layui-icon layui-icon-search"></i>查询
</button>
</div>
<button class="layui-btn layui-btn-normal" id="userQueryBtn" type="button">
<!--lsq 查询按钮取消掉图标 2022-06-29-->
查询
</button>
</div>
</form>
</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">
... ... @@ -20,11 +20,10 @@
<div id="topoiconResTypeSearchBox"></div>
</div>
</div>
<div class="layui-inline">
<button class="layui-btn layui-btn-normal" id="jtopoiconQueryBtn" type="button"><i
class="layui-icon layui-icon-search"></i>查询
</button>
</div>
<button class="layui-btn layui-btn-normal" id="jtopoiconQueryBtn" type="button">
<!--lsq 查询按钮取消掉图标 2022-06-29-->
查询
</button>
</div>
</form>
... ...
... ... @@ -28,7 +28,7 @@
</div>
</div>
<!--lsq 域视图增加搜索按钮 2022-06-27-->
<button class="layui-btn layui-btn-normal layui-btn-normal searchButton" id="searchRelationIndex"
<button style="margin-left:3px;" class="layui-btn layui-btn-normal layui-btn-normal searchButton" id="searchRelationIndex"
type="button">
查询
</button>
... ...
... ... @@ -7,7 +7,7 @@
<div class="flex-div-start margin-top-bottom-10">
<el-tooltip>
<template #content>关键字检索包含<br/>资源名称<br/>IP地址</template>
<el-input class="margin-right-10" clearable
<el-input :size="$global.elementConfig.size.input" class="margin-right-10" clearable
placeholder="输入关键字"
style="width:160px;margin-left: 10px;float: left;"
v-model="keyWords"/>
... ... @@ -29,7 +29,7 @@
<div class="flex-div-start" style="float: left;">
<!-- <el-button type="primary" @click="onReset()">重置</el-button>-->
<el-button @click="onBtnSearch()" style="margin-left: 10px" type="primary">查询
<el-button :size="$global.elementConfig.size.button" @click="onBtnSearch()" style="margin-left: 10px" type="primary">查询
</el-button>
</div>
... ...
... ... @@ -4,9 +4,9 @@
<div class="set-add-div">
<el-row>
<div class="flex-div-start">
<el-button @click="save()" style="margin-left: 10px" type="primary">新增</el-button>
<el-button :size="$global.elementConfig.size.button" @click="save()" style="margin-left: 10px" type="primary">新增</el-button>
<!-- <el-button type="primary" @click="deleteOther()" style="margin-left: 10px">删除</el-button>-->
<el-button @click="conserve()" style="margin-left: 10px" type="primary">保存</el-button>
<el-button :size="$global.elementConfig.size.button" @click="conserve()" style="margin-left: 10px" type="primary">保存</el-button>
</div>
</el-row>
<!--标签-->
... ...