monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by XuHaoJie
Commit c81c2475a0e6e656bffdfd1c0ee2af33753494cf 1 parent e5246326

通用-端口侦测-样式调整

Inline Side-by-side
Showing 5 changed files with 24 additions and 20 deletions
@@ -5,8 +5,12 @@ @@ -5,8 +5,12 @@
5 <el-row style="margin-bottom: 5px;margin-top: 5px"> 5 <el-row style="margin-bottom: 5px;margin-top: 5px">
6 <el-col :span="24"> 6 <el-col :span="24">
7 <div class="flex-div-start margin-top-bottom-10"> 7 <div class="flex-div-start margin-top-bottom-10">
8 - <el-input style="width:160px;margin-left: 10px;float: left;" class="margin-right-10" v-model="keyWords"  
9 - placeholder="输入关键字"/> 8 + <el-tooltip placement="right-end">
  9 + <template #content>关键字检索包含<br />资源名称<br />IP地址</template>
  10 + <el-input style="width:160px;margin-left: 10px;float: left;" class="margin-right-10"
  11 + v-model="keyWords"
  12 + placeholder="输入关键字" @click.danger="deleteItem(scope.row,scope.$index)"/>
  13 + </el-tooltip>
10 <el-dropdown style="margin-top: -15px;margin-left: 10px;float: left;"> 14 <el-dropdown style="margin-top: -15px;margin-left: 10px;float: left;">
11 <el-icon class="el-icon--right"> 15 <el-icon class="el-icon--right">
12 <arrow-down/> 16 <arrow-down/>
@@ -30,7 +34,7 @@ @@ -30,7 +34,7 @@
30 </el-col> 34 </el-col>
31 </el-row> 35 </el-row>
32 <el-row> 36 <el-row>
33 - <div class="flex-div-start"> 37 + <div class="flex-div-start" style="margin: 4px;">
34 <el-button type="primary" @click="save()" style="margin-left: 10px">新增</el-button> 38 <el-button type="primary" @click="save()" style="margin-left: 10px">新增</el-button>
35 <el-button type="primary" @click="deleteOther()" style="margin-left: 10px">删除</el-button> 39 <el-button type="primary" @click="deleteOther()" style="margin-left: 10px">删除</el-button>
36 </div> 40 </div>
@@ -44,7 +48,7 @@ @@ -44,7 +48,7 @@
44 @loaddata="loadTableDataList" 48 @loaddata="loadTableDataList"
45 @selectionChange="selectionChange" 49 @selectionChange="selectionChange"
46 :showIndex="true" 50 :showIndex="true"
47 - :showSelection="false" 51 + :showSelection="true"
48 :showBorder="true" 52 :showBorder="true"
49 :loading="loading" 53 :loading="loading"
50 :showPage="true" 54 :showPage="true"
@@ -31,32 +31,32 @@ export default { @@ -31,32 +31,32 @@ export default {
31 align: 'center', 31 align: 'center',
32 }, 32 },
33 { 33 {
34 - prop: 'adminName',  
35 - label: '负责人', 34 + prop: 'healthDesc',
  35 + label: '资源状态',
36 sortable: true, 36 sortable: true,
37 align: 'center', 37 align: 'center',
38 }, 38 },
39 { 39 {
40 - prop: 'phone',  
41 - label: '负责人电话', 40 + prop: 'linkState',
  41 + label: '连接状态',
42 sortable: true, 42 sortable: true,
43 align: 'center', 43 align: 'center',
44 }, 44 },
45 { 45 {
46 - prop: 'lastCollTime',  
47 - label: '最近采集时间', 46 + prop: 'adminName',
  47 + label: '负责人',
48 sortable: true, 48 sortable: true,
49 align: 'center', 49 align: 'center',
50 }, 50 },
51 { 51 {
52 - prop: 'healthDesc',  
53 - label: '资源状态', 52 + prop: 'phone',
  53 + label: '负责人电话',
54 sortable: true, 54 sortable: true,
55 align: 'center', 55 align: 'center',
56 }, 56 },
57 { 57 {
58 - prop: 'linkState',  
59 - label: '连接状态', 58 + prop: 'lastCollTime',
  59 + label: '最近采集时间',
60 sortable: true, 60 sortable: true,
61 align: 'center', 61 align: 'center',
62 } 62 }
@@ -9,9 +9,9 @@ @@ -9,9 +9,9 @@
9 <el-button type="primary" @click="conserve()" style="margin-left: 10px">保存</el-button> 9 <el-button type="primary" @click="conserve()" style="margin-left: 10px">保存</el-button>
10 </div> 10 </div>
11 </el-row> 11 </el-row>
12 - <!--下拉框--> 12 + <!--标签-->
13 <port-sense-select :dataList="portSenseSelectData" :fatherList="portSenseConfigData" @callback="selectRes"></port-sense-select> 13 <port-sense-select :dataList="portSenseSelectData" :fatherList="portSenseConfigData" @callback="selectRes"></port-sense-select>
14 - <el-row class="margin-bottom-50"> 14 + <el-row class="margin-bottom-50" style="margin-top: 3px">
15 <el-col :span="24" class="table-height"> 15 <el-col :span="24" class="table-height">
16 <cm-table-page :columns="columns" 16 <cm-table-page :columns="columns"
17 :dataList="portSenseConfigData" 17 :dataList="portSenseConfigData"
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 @loaddata="loadTableDataList" 20 @loaddata="loadTableDataList"
21 @selectionChange="selectionChange" 21 @selectionChange="selectionChange"
22 :showIndex="true" 22 :showIndex="true"
23 - :showSelection="true" 23 + :showSelection="false"
24 :showBorder="true" 24 :showBorder="true"
25 :loading="loading" 25 :loading="loading"
26 :showPage="true" 26 :showPage="true"
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <el-col :span="23"> 3 <el-col :span="23">
4 <div v-for="(item,index) in dataArr" style="float: left;display: inline-block"> 4 <div v-for="(item,index) in dataArr" style="float: left;display: inline-block">
5 <div class="" style="margin: 3px;"> 5 <div class="" style="margin: 3px;">
6 - <el-tag>{{ item.resName }} 6 + <el-tag style="background-color:rgb(235,245,249)">{{ item.resName }}
7 <el-button type="text" size="small" @click.prevent="deleteNode(item)"> 7 <el-button type="text" size="small" @click.prevent="deleteNode(item)">
8 <i class="el-icon-close"/> 8 <i class="el-icon-close"/>
9 </el-button> 9 </el-button>
@@ -28,7 +28,7 @@ export default { @@ -28,7 +28,7 @@ export default {
28 let initState = Vue.ref(true); 28 let initState = Vue.ref(true);
29 //初始化 29 //初始化
30 let init = () => { 30 let init = () => {
31 - rowMaxHeight.value = "max-height: 70px;"; 31 + rowMaxHeight.value = "max-height: 75px;";
32 initState.value = true; 32 initState.value = true;
33 showIcon.value = "el-icon-arrow-down"; 33 showIcon.value = "el-icon-arrow-down";
34 } 34 }
@@ -77,7 +77,7 @@ export default { @@ -77,7 +77,7 @@ export default {
77 } 77 }
78 //是否展开点击 78 //是否展开点击
79 let changeItem = () => { 79 let changeItem = () => {
80 - rowMaxHeight.value = initState.value ? "" : "max-height: 70px;"; 80 + rowMaxHeight.value = initState.value ? "" : "max-height: 75px;";
81 showIcon.value = initState.value ? "el-icon-arrow-up" : "el-icon-arrow-down"; 81 showIcon.value = initState.value ? "el-icon-arrow-up" : "el-icon-arrow-down";
82 initState.value = !initState.value; 82 initState.value = !initState.value;
83 } 83 }