monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by xwx
Commit d2040e31d43ee82c1e22faeb8b049c50b14a3669 2 parents cc7e90eb cda2c83d

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

Inline Side-by-side
Showing 9 changed files with 51 additions and 32 deletions
@@ -117,11 +117,21 @@ @@ -117,11 +117,21 @@
117 line-height: 30px; 117 line-height: 30px;
118 letter-spacing: 3px; 118 letter-spacing: 3px;
119 cursor: pointer; 119 cursor: pointer;
  120 + font-size: 12px;
120 } 121 }
121 .pie-flex-end{ 122 .pie-flex-end{
122 display: flex; 123 display: flex;
123 justify-content: end; 124 justify-content: end;
124 align-items: center; 125 align-items: center;
125 } 126 }
  127 +.select-div-flex{
  128 + display: flex;
  129 + align-items: center;
  130 + font-size: 12px;
  131 + justify-content: end;
  132 +}
  133 +.pie-date-range{
  134 + flex:1;
  135 + }
126 136
127 /* //End LSQ 2022/1/17*/ 137 /* //End LSQ 2022/1/17*/
1 <el-row class="dataRange-container"> 1 <el-row class="dataRange-container">
2 <el-col :span="24"> 2 <el-col :span="24">
3 <div class="tabs-div date-flex-div-around"> 3 <div class="tabs-div date-flex-div-around">
4 - <el-col :span="18">  
5 - <el-date-picker 4 + <el-col :span="16" class="select-div-flex">
  5 + 时间范围：<el-date-picker
6 class="picker-div" 6 class="picker-div"
7 v-model="dateValue" 7 v-model="dateValue"
8 type="datetimerange" 8 type="datetimerange"
@@ -17,19 +17,19 @@ @@ -17,19 +17,19 @@
17 > 17 >
18 </el-date-picker> 18 </el-date-picker>
19 </el-col> 19 </el-col>
20 - <el-col :span="6" class="select-div">  
21 - <!-- <el-select v-model="checkedId" class="m-2" placeholder="聚合频率" size="large"> 20 + <el-col :span="8" class="select-div-flex">
  21 + 聚合频率：<el-select v-model="checkedId" class="m-2" placeholder="聚合频率" size="small" @change="changeItem"
  22 + >
22 <el-option 23 <el-option
23 v-for="item in frequencyData" 24 v-for="item in frequencyData"
24 :key="item.ddicDesc" 25 :key="item.ddicDesc"
25 :label="item.ddicName" 26 :label="item.ddicName"
26 :value="item.ddicDesc" 27 :value="item.ddicDesc"
27 - @change="changeItem"  
28 > 28 >
29 </el-option> 29 </el-option>
30 - </el-select>--> 30 + </el-select>
31 31
32 - <el-dropdown split-button type="primary" size="small"> 32 + <!--<el-dropdown split-button type="primary" size="small">
33 聚合频率 33 聚合频率
34 <template #dropdown> 34 <template #dropdown>
35 <el-dropdown-menu> 35 <el-dropdown-menu>
@@ -41,7 +41,7 @@ @@ -41,7 +41,7 @@
41 </el-dropdown-item> 41 </el-dropdown-item>
42 </el-dropdown-menu> 42 </el-dropdown-menu>
43 </template> 43 </template>
44 - </el-dropdown> 44 + </el-dropdown>-->
45 </el-col> 45 </el-col>
46 </div> 46 </div>
47 </el-col> 47 </el-col>
@@ -64,9 +64,10 @@ export default { @@ -64,9 +64,10 @@ export default {
64 let checkedId=Vue.ref(); 64 let checkedId=Vue.ref();
65 let commandVal=Vue.ref('聚合频率') 65 let commandVal=Vue.ref('聚合频率')
66 //聚合频率选择 66 //聚合频率选择
67 - const changeItem=(val,name)=>{ 67 + // const changeItem=(val,name)=>{
  68 + const changeItem=(val)=>{
68 checkedId.value=val; 69 checkedId.value=val;
69 - commandVal.value=name; 70 + // commandVal.value=name;
70 loadPerformance(); 71 loadPerformance();
71 emit('callbackrate',val) 72 emit('callbackrate',val)
72 } 73 }
@@ -293,7 +294,9 @@ export default { @@ -293,7 +294,9 @@ export default {
293 if (res && res.data) { 294 if (res && res.data) {
294 frequencyData.value = res.data; 295 frequencyData.value = res.data;
295 if(frequencyData.value.length>0){ 296 if(frequencyData.value.length>0){
296 - checkedId.value=frequencyData.value[0].ddicDesc 297 + if(!props.intervalGroup){
  298 + checkedId.value=frequencyData.value[0].ddicDesc
  299 + }
297 } 300 }
298 301
299 } 302 }
@@ -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 }
@@ -7,7 +7,9 @@ @@ -7,7 +7,9 @@
7 <el-row class="detail-content-title"> 7 <el-row class="detail-content-title">
8 <el-col :span="8"></el-col> 8 <el-col :span="8"></el-col>
9 <el-col :span="16" class="pie-flex-end"> 9 <el-col :span="16" class="pie-flex-end">
10 - <cm-date-range v-if="interval=='custom'" @callbacksure="getOptionData" @callbacktime="callbacktime" @callbackrate="callbackrate"></cm-date-range> 10 + <div class="pie-date-range">
  11 + <cm-date-range v-if="interval=='custom'" @callbacksure="getOptionData" @callbacktime="callbacktime" @callbackrate="callbackrate"></cm-date-range>
  12 + </div>
11 <div class="line-filter pie-line-filter"> 13 <div class="line-filter pie-line-filter">
12 <div class="linechartfrequency line-filter-content"> 14 <div class="linechartfrequency line-filter-content">
13 <div v-if="interval!='custom'" @click="changeInterval('DAY')" :class="['line-filter-item', {'active':interval=='DAY'}]" data-value="DAY" >一天</div> 15 <div v-if="interval!='custom'" @click="changeInterval('DAY')" :class="['line-filter-item', {'active':interval=='DAY'}]" data-value="DAY" >一天</div>