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

Merge branch 'dev' of https://git.mesalab.cn/cyber-narrator/cn-ui into dev

Browse Source 
# Conflicts:
#	src/views/charts/Chart2.vue
This commit is contained in:
@changcode
2022-01-19 20:14:52 +08:00
parent c5278a00d1 d693452195
commit 26b1b497c3
8 changed files with 314 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/views/charts/Chart2.vue
View File

@@ -51,6 +51,24 @@
@showLoading="showLoading"
></chart-echart-line>
<chart-time-bar
v-else-if="isEchartsTimeBar"
:chart-info="chartInfo"
:chart-data="chartData"
:result-type="resultType"
:query-params="queryParams"
@showLoading="showLoading"
></chart-time-bar>
<chart-category-bar
v-else-if="isEchartsCategoryBar"
:chart-info="chartInfo"
:chart-data="chartData"
:result-type="resultType"
:query-params="queryParams"
@showLoading="showLoading"
></chart-category-bar>
<chart-table
v-else-if="isTable"
:chart-info="chartInfo"
@@ -108,8 +126,14 @@ import ChartSingleValue from '@/views/charts/charts/ChartSingleValue'
import ChartBlock from '@/views/charts/charts/ChartBlock'
import IpBasicInfo from '@/views/charts/charts/IpBasicInfo'
import ChartEchartLine from '@/views/charts/charts/ChartEchartLine'
import ChartTable from "@/views/charts/charts/ChartTable";
import ChartTable from '@/views/charts/charts/ChartTable'
import ChartActiveIpTable from "@/views/charts/charts/ChartActiveIpTable";
import ChartTimeBar from './charts/ChartTimeBar'
import ChartCategoryBar from './charts/ChartCategoryBar'
import ChartAppBasicInfo from "@/views/charts/charts/ChartAppBasicInfo";
import ChartDomainWhois from "@/views/charts/charts/ChartDomainWhois";
import ChartDomainDnsRecord from "@/views/charts/charts/ChartDomainDnsRecord";
import ChartCryptocurrencyEventList from "@/views/charts/charts/ChartCryptocurrencyEventList";
import {
isEcharts,
isEchartsLine,
@@ -142,10 +166,6 @@ import {
isBlock
} from './charts/tools'
import _ from 'lodash'
import ChartAppBasicInfo from "@/views/charts/charts/ChartAppBasicInfo";
import ChartDomainWhois from "@/views/charts/charts/ChartDomainWhois";
import ChartDomainDnsRecord from "@/views/charts/charts/ChartDomainDnsRecord";
import ChartCryptocurrencyEventList from "@/views/charts/charts/ChartCryptocurrencyEventList";
export default {
name: 'chart',
@@ -163,7 +183,9 @@ export default {
ChartTabs,
ChartMap,
ChartEchartLine,
ChartBlock
ChartBlock,
ChartTimeBar,
ChartCategoryBar
},
props: {
chartInfo: Object,