monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 鲁尚清
Commit f6d2a506c6432481aba23cbdd96c77e76a5bf8f5 2 parents 235fc7b8 b2d9b72d

Merge branch 'master' of http://192.168.1.136:82/monitor_v3/hg-monitor-web into … 

…master-v32-lushangqing
Inline Side-by-side
Showing 8 changed files with 30 additions and 25 deletions
... ... @@ -25,7 +25,7 @@
<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;">
<div style="overflow: hidden; text-overflow: ellipsis; font-size:15px; display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical;">
{{scope.row[item.prop]}}
</div>
</el-tooltip>
... ...
... ... @@ -5,8 +5,12 @@
<el-row style="margin-bottom: 5px;margin-top: 5px">
<el-col :span="24">
<div class="flex-div-start margin-top-bottom-10">
<el-input style="width:160px;margin-left: 10px;float: left;" class="margin-right-10" v-model="keyWords"
placeholder="输入关键字"/>
<el-tooltip placement="right-end">
<template #content>关键字检索包含<br />资源名称<br />IP地址</template>
<el-input style="width:160px;margin-left: 10px;float: left;" class="margin-right-10"
v-model="keyWords"
placeholder="输入关键字" @click.danger="deleteItem(scope.row,scope.$index)"/>
</el-tooltip>
<el-dropdown style="margin-top: -15px;margin-left: 10px;float: left;">
<el-icon class="el-icon--right">
<arrow-down/>
... ... @@ -30,7 +34,7 @@
</el-col>
</el-row>
<el-row>
<div class="flex-div-start">
<div class="flex-div-start" style="margin: 4px;">
<el-button type="primary" @click="save()" style="margin-left: 10px">新增</el-button>
<el-button type="primary" @click="deleteOther()" style="margin-left: 10px">删除</el-button>
</div>
... ... @@ -44,7 +48,7 @@
@loaddata="loadTableDataList"
@selectionChange="selectionChange"
:showIndex="true"
:showSelection="false"
:showSelection="true"
:showBorder="true"
:loading="loading"
:showPage="true"
... ...
... ... @@ -31,32 +31,32 @@ export default {
align: 'center',
},
{
prop: 'adminName',
label: '负责人',
prop: 'healthDesc',
label: '资源状态',
sortable: true,
align: 'center',
},
{
prop: 'phone',
label: '负责人电话',
prop: 'linkState',
label: '连接状态',
sortable: true,
align: 'center',
},
{
prop: 'lastCollTime',
label: '最近采集时间',
prop: 'adminName',
label: '负责人',
sortable: true,
align: 'center',
},
{
prop: 'healthDesc',
label: '资源状态',
prop: 'phone',
label: '负责人电话',
sortable: true,
align: 'center',
},
{
prop: 'linkState',
label: '连接状态',
prop: 'lastCollTime',
label: '最近采集时间',
sortable: true,
align: 'center',
}
... ...
... ... @@ -9,9 +9,9 @@
<el-button type="primary" @click="conserve()" style="margin-left: 10px">保存</el-button>
</div>
</el-row>
<!--下拉框-->
<!--标签-->
<port-sense-select :dataList="portSenseSelectData" :fatherList="portSenseConfigData" @callback="selectRes"></port-sense-select>
<el-row class="margin-bottom-50">
<el-row class="margin-bottom-50" style="margin-top: 3px">
<el-col :span="24" class="table-height">
<cm-table-page :columns="columns"
:dataList="portSenseConfigData"
... ... @@ -20,7 +20,7 @@
@loaddata="loadTableDataList"
@selectionChange="selectionChange"
:showIndex="true"
:showSelection="true"
:showSelection="false"
:showBorder="true"
:loading="loading"
:showPage="true"
... ...
... ... @@ -3,7 +3,7 @@
<el-col :span="23">
<div v-for="(item,index) in dataArr" style="float: left;display: inline-block">
<div class="" style="margin: 3px;">
<el-tag>{{ item.resName }}
<el-tag style="background-color:rgb(235,245,249)">{{ item.resName }}
<el-button type="text" size="small" @click.prevent="deleteNode(item)">
<i class="el-icon-close"/>
</el-button>
... ...
... ... @@ -28,7 +28,7 @@ export default {
let initState = Vue.ref(true);
//初始化
let init = () => {
rowMaxHeight.value = "max-height: 70px;";
rowMaxHeight.value = "max-height: 75px;";
initState.value = true;
showIcon.value = "el-icon-arrow-down";
}
... ... @@ -77,7 +77,7 @@ export default {
}
//是否展开点击
let changeItem = () => {
rowMaxHeight.value = initState.value ? "" : "max-height: 70px;";
rowMaxHeight.value = initState.value ? "" : "max-height: 75px;";
showIcon.value = initState.value ? "el-icon-arrow-up" : "el-icon-arrow-down";
initState.value = !initState.value;
}
... ...
... ... @@ -2,7 +2,7 @@
<el-row>
<el-col :span="24">
<div class="flex-div-start margin-top-bottom-10">
<el-input class="margin-right-10" v-model="keyword" placeholder="输入关键字" />
<el-input class="margin-right-10" @keydown.enter.native="onBtnSearch()" v-model="keyword" placeholder="输入关键字" />
<div class="flex-div-start">
... ... @@ -26,7 +26,7 @@
<el-col :span="24" class="flex-div-start margin-bottom-10">
<!-- <span>匹配项：{{num}}个</span>-->
<span>[筛选：{{keyword}}]({{count}})</span>
<span style="font-size:15px;">[筛选：{{keyword}}]({{count}})</span>
</el-col>
</el-row>
... ...
... ... @@ -82,6 +82,9 @@ export default {
proxy.$http.get(`/api-web/manage/ddic/page`, params, function (res) {
if (res && res.data) {
tagData.value=res.data;
checkedId.value = res.data[0].ddicCode;
keyword.value=res.data[0].ddicCode;
getDataList();
}
});
}
... ... @@ -155,7 +158,6 @@ export default {
});
}
}
//关闭弹框回调函数
let closeDialog=()=>{
... ... @@ -169,7 +171,6 @@ export default {
// 挂载完
Vue.onMounted(() => {
getConf();
getDataList();
})
return {
... ...