gfwleak/cyber-narrator-cn-ui
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

下钻表格查询条件更改（npm,dns）,及样式调整

Browse Source
This commit is contained in:
hyx
2023-09-08 17:09:06 +08:00
parent d9e6ea339c
commit ce7a8d7456
4 changed files with 33 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/charts2/charts/networkOverview/NetworkOverviewTabs.vue
View File

@@ -1798,7 +1798,7 @@ export default {
this.activeCustomize = tab.paneName
},
tableCellStyle ({ row, column, rowIndex, columnIndex }) {
let style = 'border-right:0px;font-size:12px;padding:7px 0 !important;border-bottom: 1px solid #ECECEC;height:41px !important;'
let style = 'border-right:0px;font-size:12px;padding:7px 0 !important;border-bottom: 1px solid #ECECEC;height:39px !important;'
if (rowIndex === this.tableData.length - 1) {
// style = style + 'border-bottom:0px !important;'
}
@@ -1809,7 +1809,7 @@ export default {
},
tableHeaderCellStyle ({ row, column, rowIndex, columnIndex }) {
if (columnIndex === 0) {
return 'text-align:left;border-right:0px;font-size:12px;font-weight:500;padding:4px 0 !important;border-bottom: 1px solid #E2E5EC;'
return 'text-align:left;border-right:0px;font-size:12px;font-weight:500;padding:5px 0 !important;border-bottom: 1px solid #E2E5EC;'
} else {
return 'border-right:0px;font-size:12px;font-weight:500;padding:4px 0 !important;border-bottom: 1px solid #E2E5EC;'
}

16
src/views/charts2/charts/npm/NpmNetworkQuantity.vue
View File

@@ -71,13 +71,13 @@ export default {
mixins: [chartMixin],
setup () {
const { query } = useRoute()
const queryCondition = ref(query.queryCondition || '')
const lineQueryCondition = ref(query.lineQueryCondition || '')
const dimensionType = ref(query.dimensionType || '')
const tabIndex = ref(query.tabIndex || 0)
const tabOperationType = ref(query.tabOperationType)
const networkOverviewBeforeTab = ref(query.networkOverviewBeforeTab || '')
return {
queryCondition,
lineQueryCondition,
dimensionType,
tabIndex,
tabOperationType,
@@ -113,12 +113,12 @@ export default {
npmNetworkCycleQuery () {
let condition = ''
let url = ''
if (this.queryCondition && this.queryCondition.indexOf(' OR ') > -1) {
condition = this.queryCondition.split(/["|'](.*?)["|']/)
} else if (this.queryCondition.indexOf('+OR+') > -1) {
condition = this.queryCondition.replace(/\+/g, ' ').split(/["|'](.*?)["|']/)
if (this.lineQueryCondition && this.lineQueryCondition.indexOf(' OR ') > -1) {
condition = this.lineQueryCondition.split(/["|'](.*?)["|']/)
} else if (this.lineQueryCondition.indexOf('+OR+') > -1) {
condition = this.lineQueryCondition.replace(/\+/g, ' ').split(/["|'](.*?)["|']/)
} else {
condition = this.queryCondition
condition = this.lineQueryCondition
}
const type = this.dimensionType || this.networkOverviewBeforeTab
const params = {
@@ -133,7 +133,7 @@ export default {
this.side = 'server'
}
if (type === 'ip') { // condition 为数组时数组长度不为 0 | type 不为空 | type为ip
if (type === 'ip' || type === 'clientIp' || type === 'serverIp') { // condition 为数组时数组长度不为 0 | type 不为空 | type为ip
params.q = `${condition} and side='${this.side}'`
} else {
params.q = condition

2
src/views/charts2/charts/npm/NpmTrafficLine.vue
View File

@@ -133,7 +133,7 @@ export default {
type: type
}
if (type === 'ip') {
if (type === 'ip' || type === 'clientIp' || type === 'serverIp') {
params.q = `${condition} and side='${this.side}'`
} else {
params.q = condition