fix:endpoint的asset列/overview-traffic-dc下拉
This commit is contained in:
@@ -82,18 +82,6 @@
|
|||||||
<span>{{$t("dashboard.overview.traffic")}}</span>
|
<span>{{$t("dashboard.overview.traffic")}}</span>
|
||||||
<span class="content-col-title-tools">
|
<span class="content-col-title-tools">
|
||||||
<time-picker ref="calendarPanel" class="nz-dashboard-picker" @change="dateChange"></time-picker>
|
<time-picker ref="calendarPanel" class="nz-dashboard-picker" @change="dateChange"></time-picker>
|
||||||
<!--<el-dropdown trigger="hover" :show-timeout="0" size="small" :hide-on-click="false" @command="selectDatacenter">
|
|
||||||
<span class="content-col-title-tool">{{$t("dashboard.overview.dataCenter.dataCenter")}} <i class="el-icon-arrow-down"></i></span>
|
|
||||||
<el-dropdown-menu slot="dropdown" class="el-dropdown-multi">
|
|
||||||
<el-dropdown-item :class="{'dropdown-item-active': trendSearchParam.dc.indexOf(item.id) > -1}" :command="item" v-for="(item,index) in trafficDatacenterData" :key="index">{{item.name}}</el-dropdown-item>
|
|
||||||
</el-dropdown-menu>
|
|
||||||
</el-dropdown>
|
|
||||||
<el-dropdown trigger="hover" :show-timeout="0" size="small" :hide-on-click="false" @command="selectTag">
|
|
||||||
<span class="content-col-title-tool">{{$t("overall.tag")}} <i class="el-icon-arrow-down"></i></span>
|
|
||||||
<el-dropdown-menu slot="dropdown" class="el-dropdown-multi">
|
|
||||||
<el-dropdown-item :class="{'dropdown-item-active': trendSearchParam.tag.some(tag => {return item.name == tag.name && item.value == tag.value;})}" :command="item" v-for="(item,index) in trafficTagData" :key="index">{{item.name}} : {{item.value}}</el-dropdown-item>
|
|
||||||
</el-dropdown-menu>
|
|
||||||
</el-dropdown>-->
|
|
||||||
<span class="content-col-title-tool">
|
<span class="content-col-title-tool">
|
||||||
<el-cascader
|
<el-cascader
|
||||||
:options="trafficData"
|
:options="trafficData"
|
||||||
@@ -109,7 +97,6 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="content-col-content">
|
<div class="content-col-content">
|
||||||
<chart-box chart-type="overviewLine" ref="chartbox" :show-toolbox="false" name="trend" :unit="15" @is-loading="(isLoading)=>{this.trendLoading = isLoading}"></chart-box>
|
<chart-box chart-type="overviewLine" ref="chartbox" :show-toolbox="false" name="trend" :unit="15" @is-loading="(isLoading)=>{this.trendLoading = isLoading}"></chart-box>
|
||||||
<!-- <div class="no-data-tip" v-if="!trendLoading && ((!chartSeries[0] && !chartSeries[1]) || (chartSeries[0].data.length == 0 && chartSeries[1] && chartSeries[1].data.length == 0))">N/A</div>-->
|
|
||||||
<div class="chart-no-data" v-if="!trendLoading && ((!chartSeries[0] && !chartSeries[1]) || (chartSeries[0].data.length == 0 && chartSeries[1] && chartSeries[1].data.length == 0))">No Data</div>
|
<div class="chart-no-data" v-if="!trendLoading && ((!chartSeries[0] && !chartSeries[1]) || (chartSeries[0].data.length == 0 && chartSeries[1] && chartSeries[1].data.length == 0))">No Data</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -117,8 +104,6 @@
|
|||||||
<div class="content-col-title">{{$t("dashboard.overview.dataCenter.dataCenter")}}</div>
|
<div class="content-col-title">{{$t("dashboard.overview.dataCenter.dataCenter")}}</div>
|
||||||
<div class="content-col-content">
|
<div class="content-col-content">
|
||||||
<chart-box chart-type="map" :tooltip-formatter="mapTooltipFormatter" :map="map" ref="dataCenterMap" @is-loading="(isLoading)=>{this.mapLoading = isLoading}"></chart-box>
|
<chart-box chart-type="map" :tooltip-formatter="mapTooltipFormatter" :map="map" ref="dataCenterMap" @is-loading="(isLoading)=>{this.mapLoading = isLoading}"></chart-box>
|
||||||
<!-- <div class="no-data-tip" v-if="!mapLoading && (!map || !map.geoJson || !map.geoJson.geoJson)">N/A</div>-->
|
|
||||||
<!-- <div class="chart-no-data" v-if="!mapLoading && (!map || !map.geoJson || !map.geoJson.geoJson)">No Data</div>-->
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -909,8 +894,6 @@
|
|||||||
this.$get('idc/trafficSetting', {pageSize: -1}).then(response => {
|
this.$get('idc/trafficSetting', {pageSize: -1}).then(response => {
|
||||||
if (response.code === 200) {
|
if (response.code === 200) {
|
||||||
this.trafficData = this.convertTrafficData(response.data.list);
|
this.trafficData = this.convertTrafficData(response.data.list);
|
||||||
|
|
||||||
//console.info(this.trafficData)
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
@@ -918,28 +901,14 @@
|
|||||||
let result = [];
|
let result = [];
|
||||||
data.forEach(item => {
|
data.forEach(item => {
|
||||||
let hasDc = result.some(dc => { //dc去重
|
let hasDc = result.some(dc => { //dc去重
|
||||||
if (dc.label == item.idc.name) {
|
if (item.idc && dc.label == item.idc.name) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
if (!hasDc) {
|
if (item.idc && !hasDc) {
|
||||||
result.push({label: item.idc.name, value: "$dc$::" + item.idc.name, level: 1});
|
result.push({label: item.idc.name, value: "$dc$::" + item.idc.name, level: 1});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
/*data.forEach(item => {
|
|
||||||
let hasDc = result.some(dc => { //dc去重
|
|
||||||
if (dc.label == item.idc.name) {
|
|
||||||
handleTag(dc, item.tags);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
});
|
|
||||||
if (!hasDc) {
|
|
||||||
let dc = {label: item.idc.name, value: "$dc$::" + item.idc.name, children: [], level: 1};
|
|
||||||
handleTag(dc, item.tags);
|
|
||||||
result.push(dc);
|
|
||||||
}
|
|
||||||
});*/
|
|
||||||
function handleTag(dc, tagData) { // dc: cascader数据里的第一级;tagData: 原始数据中的tags
|
function handleTag(dc, tagData) { // dc: cascader数据里的第一级;tagData: 原始数据中的tags
|
||||||
if (tagData) {
|
if (tagData) {
|
||||||
let tags = dc.children;
|
let tags = dc.children;
|
||||||
@@ -1386,7 +1355,6 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
this.initDate();
|
|
||||||
this.initData();
|
this.initData();
|
||||||
window.onresize = () => {
|
window.onresize = () => {
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
|
|||||||
@@ -105,7 +105,7 @@
|
|||||||
min-width="110px"
|
min-width="110px"
|
||||||
>
|
>
|
||||||
<template slot-scope="scope" :column="item" >
|
<template slot-scope="scope" :column="item" >
|
||||||
<span v-if="item.prop == 'asset' && scope.row[item.prop]" class="link" @click="viewAsset(scope.row)">{{scope.row[item.prop].host}}</span>
|
<span v-if="item.prop == 'asset' && scope.row[item.prop]" class="link" @click="detail(scope.row)">{{scope.row[item.prop].host}}</span>
|
||||||
<span v-else-if="item.prop == 'param'">
|
<span v-else-if="item.prop == 'param'">
|
||||||
<template v-if="scope.row.paramObj">
|
<template v-if="scope.row.paramObj">
|
||||||
<span v-for="(p,i) in scope.row.paramObj">{{p.key}}={{p.value}}<span v-if="i < scope.row.paramObj.length-1">,</span></span>
|
<span v-for="(p,i) in scope.row.paramObj">{{p.key}}={{p.value}}<span v-if="i < scope.row.paramObj.length-1">,</span></span>
|
||||||
|
|||||||
Reference in New Issue
Block a user