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

@@ -117,11 +117,21 @@
     line-height: 30px;
     letter-spacing: 3px;
     cursor: pointer;
+    font-size: 12px;
 }
 .pie-flex-end{
     display: flex;
     justify-content: end;
     align-items: center;
 }
+.select-div-flex{
+    display: flex;
+    align-items: center;
+    font-size: 12px;
+    justify-content: end;
+}
+.pie-date-range{
+    flex:1;
+ }
 
 /* //End LSQ 2022/1/17*/
\ No newline at end of file

 <el-row class="dataRange-container">
     <el-col :span="24">
         <div class="tabs-div date-flex-div-around">
-            <el-col :span="18">
-                <el-date-picker
+            <el-col :span="16" class="select-div-flex">
+                时间范围：<el-date-picker
                         class="picker-div"
                         v-model="dateValue"
                         type="datetimerange"
@@ -17,19 +17,19 @@
                 >
                 </el-date-picker>
             </el-col>
-            <el-col :span="6" class="select-div">
-               <!-- <el-select v-model="checkedId" class="m-2" placeholder="聚合频率" size="large">
+            <el-col :span="8" class="select-div-flex">
+                聚合频率：<el-select v-model="checkedId" class="m-2" placeholder="聚合频率" size="small" @change="changeItem"
+                >
                     <el-option
                             v-for="item in frequencyData"
                             :key="item.ddicDesc"
                             :label="item.ddicName"
                             :value="item.ddicDesc"
-                            @change="changeItem"
                     >
                     </el-option>
-                </el-select>-->
+                </el-select>
 
-                <el-dropdown split-button type="primary" size="small">
+                <!--<el-dropdown split-button type="primary" size="small">
                         聚合频率
                     <template #dropdown>
                         <el-dropdown-menu>
@@ -41,7 +41,7 @@
                             </el-dropdown-item>
                         </el-dropdown-menu>
                     </template>
-                </el-dropdown>
+                </el-dropdown>-->
             </el-col>
         </div>
     </el-col>

@@ -64,9 +64,10 @@ export default {
         let checkedId=Vue.ref();
         let commandVal=Vue.ref('聚合频率')
         //聚合频率选择
-        const changeItem=(val,name)=>{
+        // const changeItem=(val,name)=>{
+        const changeItem=(val)=>{
             checkedId.value=val;
-            commandVal.value=name;
+            // commandVal.value=name;
             loadPerformance();
             emit('callbackrate',val)
         }
@@ -293,7 +294,9 @@ export default {
                 if (res && res.data) {
                     frequencyData.value = res.data;
                     if(frequencyData.value.length>0){
-                        checkedId.value=frequencyData.value[0].ddicDesc
+                        if(!props.intervalGroup){
+                            checkedId.value=frequencyData.value[0].ddicDesc
+                        }
                     }
 
                 }

@@ -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;
         }

@@ -7,7 +7,9 @@
     <el-row class="detail-content-title">
       <el-col :span="8"></el-col>
       <el-col :span="16" class="pie-flex-end">
-        <cm-date-range v-if="interval=='custom'"  @callbacksure="getOptionData" @callbacktime="callbacktime" @callbackrate="callbackrate"></cm-date-range>
+        <div class="pie-date-range">
+          <cm-date-range v-if="interval=='custom'"  @callbacksure="getOptionData" @callbacktime="callbacktime" @callbackrate="callbackrate"></cm-date-range>
+        </div>
         <div class="line-filter pie-line-filter">
           <div class="linechartfrequency line-filter-content">
             <div v-if="interval!='custom'" @click="changeInterval('DAY')" :class="['line-filter-item', {'active':interval=='DAY'}]" data-value="DAY"  >一天</div>