diff --git a/src/api/disRevenue/resource.js b/src/api/disRevenue/resource.js
index b5af3ad..e9b2776 100644
--- a/src/api/disRevenue/resource.js
+++ b/src/api/disRevenue/resource.js
@@ -743,6 +743,14 @@ export function bindBusByClient(query) {
data: query
})
}
+// 上报带宽值修改
+export function repBandwidthSubmit(query) {
+ return request({
+ url: '/system/registration/addReportedBandwidth',
+ method: 'post',
+ data: query
+ })
+}
export function networkList(query) {
return request({
url: '/rocketmq/networkInterface/list',
@@ -878,6 +886,22 @@ export function trafficEcharts(data) {
data: data
})
}
+// 图形监控-自动发现项-网络接口的-IPv4流量
+export function trafficIPv4Echarts(data) {
+ return request({
+ url: '/rocketmq/traffic/netInterfaceIpv4TrafficEcharts',
+ method: 'post',
+ data: data
+ })
+}
+// 图形监控-自动发现项-网络接口的-IPv6流量
+export function trafficIPv6Echarts(data) {
+ return request({
+ url: '/rocketmq/traffic/netInterfaceIpv6TrafficEcharts',
+ method: 'post',
+ data: data
+ })
+}
// 图形监控-自动发现项-网络接口的-丢数
export function droppedEcharts(data) {
return request({
diff --git a/src/components/RightToolbar/index.vue b/src/components/RightToolbar/index.vue
index 1be1c8f..d64022d 100644
--- a/src/components/RightToolbar/index.vue
+++ b/src/components/RightToolbar/index.vue
@@ -19,7 +19,7 @@
-
+
@@ -176,7 +176,10 @@ export default {
this.columns.forEach((col) => (col.visible = newValue))
} else {
Object.keys(newBackup).forEach(col => {
- newBackup[col].visible = newValue;
+ // 不修改禁用的按钮
+ if (!newBackup[col].disabled) {
+ newBackup[col].visible = newValue;
+ }
this.$set(this.columns, col, newBackup[col]);
});
// Object.values(this.columns).forEach((col) => (col.visible = newValue))
@@ -224,7 +227,7 @@ export default {
let indexNum = 0;
if (newData && Object.keys(newData).length > 0) {
Object.keys(newCol).forEach(keyName => {
- if (newData[keyName]) {
+ if (newData[keyName] || (newCol[keyName].disabled && newCol[keyName].visible)) {
indexNum++;
newCol[keyName].visible = true;
} else {
diff --git a/src/components/echartsList/dateTimeSelect.vue b/src/components/echartsList/dateTimeSelect.vue
index 188a709..5ca5c92 100644
--- a/src/components/echartsList/dateTimeSelect.vue
+++ b/src/components/echartsList/dateTimeSelect.vue
@@ -1,5 +1,5 @@
-
+
diff --git a/src/components/table/index.vue b/src/components/table/index.vue
index 7d997f9..cdc0399 100644
--- a/src/components/table/index.vue
+++ b/src/components/table/index.vue
@@ -10,7 +10,7 @@
- handleClick({fnCode: 'currentData'},val)" highlight-selection-row @select-all="handleSelectAll" @select="handleSelectionChange">
+ handleClick({fnCode: 'currentData'},val)" highlight-selection-row @select-all="handleSelectAll" @select="handleSelectionChange" @sort-change="handleSortChange">
@@ -27,7 +27,7 @@
-
+
-
+
{{column.label}}
@@ -419,6 +419,52 @@
}
this.tableKey++;
},
+ // 排序发生变化时
+ handleSortChange({column, prop, order}) {
+ let sortType = 3;
+ if (order === 'ascending') {
+ sortType = 1;
+ } else if (order === 'descending') {
+ sortType = 2;
+ }
+ this.$emit("fnClick", {fnCode: 'sortTable'}, {sortType: sortType});
+ },
+ // 排序图标替换
+ renderHeader(h, { column, $index }) {
+ if (column && column.sortable) {
+ if (column.order === 'ascending') {
+ // 升序图标
+ return (
+
+ {column.label}
+
+
+
+ );
+ } else if (column.order === 'descending') {
+ // 降序图标
+ return (
+
+ {column.label}
+
+
+
+ );
+ } else {
+ // 默认状态(无序)
+ return (
+
+ {column.label}
+
+
+ );
+ }
+ }
+ return h('div', [
+ h('span', column.label), // 标题文本
+ // h('i', { class: iconClass }) // 排序图标
+ ]);
+ },
}
}
@@ -438,6 +484,9 @@
white-space: normal; /* 允许自动换行 */
line-height: 1.6; /* 调整行高,提升可读性 */
}
+ ::v-deep .caret-wrapper {
+ display: none !important;
+ }