From c5278a00d12b9547eed3176b962be274ce7b7fda Mon Sep 17 00:00:00 2001 From: "@changcode" Date: Wed, 19 Jan 2022 20:11:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?CN-273=20feat:=20=E5=9B=BE=E8=A1=A8?= =?UTF-8?q?=E9=87=8D=E6=9E=84-=E7=89=B9=E6=AE=8A=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../css/components/views/charts/panel.scss | 197 +++++++++++++++++- src/views/charts/Chart2.vue | 61 +++++- .../charts/charts/ChartActiveIpTable.vue | 13 ++ src/views/charts/charts/ChartAppBasicInfo.vue | 103 +++++++++ .../charts/ChartCryptocurrencyEventList.vue | 56 +++++ .../charts/charts/ChartDomainDnsRecord.vue | 52 +++++ src/views/charts/charts/ChartDomainWhois.vue | 54 +++++ 7 files changed, 527 insertions(+), 9 deletions(-) create mode 100644 src/views/charts/charts/ChartActiveIpTable.vue create mode 100644 src/views/charts/charts/ChartAppBasicInfo.vue create mode 100644 src/views/charts/charts/ChartCryptocurrencyEventList.vue create mode 100644 src/views/charts/charts/ChartDomainDnsRecord.vue create mode 100644 src/views/charts/charts/ChartDomainWhois.vue diff --git a/src/assets/css/components/views/charts/panel.scss b/src/assets/css/components/views/charts/panel.scss index 928bf107..23ee3507 100644 --- a/src/assets/css/components/views/charts/panel.scss +++ b/src/assets/css/components/views/charts/panel.scss @@ -499,7 +499,7 @@ height: calc(100% - 40px); } } - &>.cn-chart__table, { + &>.cn-chart__table,{ .cn-chart__header { border-bottom: 1px solid $--content-right-background-color; .header__operations { @@ -750,6 +750,201 @@ margin-left: 10px; } } + &>.cn-chart__app-basic { + display: flex; + flex-direction: column; + .cn-chart__body { + flex: auto; + display: flex; + .el-descriptions { + padding-top: 30px; + } + &>.el-descriptions { + flex: 0 0 350px; + padding: 30px 36px; + } + .chart-location { + display: flex; + flex: 1; + flex-direction: column; + padding: 0 20px 20px 0; + } + .el-descriptions__content { + color: #3976CB; + } + } + .cn-chart__body-single { + display: flex; + .cn-chart__body-single-table { + display: flex; + width: 250px; + align-items: center; + } + .single-value-icon__box { + display: flex; + align-items: center; + justify-content: center; + flex: 0 0 40%; + } + .single-value__icon { + display: flex; + justify-content: center; + width: 72px; + height: 72px; + background-color: $--chart-single-value-icon-background-color; + border-radius: 50%; + + i { + display: flex; + align-items: center; + font-size: 28px; + color: $--color-primary; + } + } + .single-value-color-g.single-value__icon { + background-color: limegreen; + i { + color: green; + } + } + .single-value-color-y.single-value__icon { + background-color: yellow; + i { + color: darkorange; + } + } + .single-value__content { + display: flex; + flex-direction: column; + max-width: 60%; + padding-right: 10px; + + .content__data { + padding-bottom: 7%; + font-size: 24px; + color: #333333; + font-weight: bold; + } + .content__title { + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + font-size: 16px; + color: #666666; + } + &.single-value__content--with-chart { + .content__title { + border-bottom: 1px solid $--content-right-background-color; + } + } + .single-value__unit { + font-weight: normal; + padding-left: 10px; + color: #666; + font-size: 20px; + } + } + } + } + &>.cn-chart__dns-record { + display: flex; + flex-direction: column; + height: 100%; + width: 100%; + .cn-chart__body { + flex: auto; + display: flex; + height: 100%; + width: 100%; + .el-descriptions { + padding-top: 30px; + } + &>.el-descriptions { + flex: 0 0 350px; + padding: 30px 36px; + } + .chart-location { + display: flex; + flex: 1; + flex-direction: column; + padding: 0 20px 20px 0; + } + .el-descriptions__content { + color: #3976CB; + } + } + } + .cn-chart__table.eventList { + display: flex; + flex-direction: column; + height: 100%; + width: 100%; + .cn-chart__body { + flex: auto; + display: flex; + height: 100%; + width: 100%; + .el-descriptions { + padding-top: 30px; + } + &>.el-descriptions { + flex: 0 0 350px; + padding: 30px 36px; + } + .chart-location { + display: flex; + flex: 1; + flex-direction: column; + padding: 0 20px 20px 0; + } + .el-descriptions__content { + color: #3976CB; + } + .crypto-eventList__record { + display: flex; + height: 100%; + width: 100%; + + .record__table { + display: table; + height: 100%; + width: 100%; + + .record__table-row { + display: table-row; + font-size: 14px; + color: #333333; + } + .record__table-row.record__table-row--header { + padding: 13px 30px 0; + height: 40px; + color: #6B717B; + } + .record__table-cell { + display: table-cell; + vertical-align: middle; + padding-left: 10px; + padding-top: 15px; + padding-bottom: 0; + + .record_second{ + color:#7e8088; + font-size:12px; + } + + .circle-red { + color: #EC7F66; + font-size: 28px; + } + + } + .record__table-cell:first-of-type { + padding-left:30px; + } + } + } + } + } } .chart__legend { width: calc(100% - 40px); diff --git a/src/views/charts/Chart2.vue b/src/views/charts/Chart2.vue index 0d209b7a..e96b3f80 100644 --- a/src/views/charts/Chart2.vue +++ b/src/views/charts/Chart2.vue @@ -60,20 +60,56 @@ @showLoading="showLoading" > + + + + + + + + + + + + diff --git a/src/views/charts/charts/ChartAppBasicInfo.vue b/src/views/charts/charts/ChartAppBasicInfo.vue new file mode 100644 index 00000000..dd2f73fe --- /dev/null +++ b/src/views/charts/charts/ChartAppBasicInfo.vue @@ -0,0 +1,103 @@ + + + + + diff --git a/src/views/charts/charts/ChartCryptocurrencyEventList.vue b/src/views/charts/charts/ChartCryptocurrencyEventList.vue new file mode 100644 index 00000000..bf50b6e5 --- /dev/null +++ b/src/views/charts/charts/ChartCryptocurrencyEventList.vue @@ -0,0 +1,56 @@ + + + diff --git a/src/views/charts/charts/ChartDomainDnsRecord.vue b/src/views/charts/charts/ChartDomainDnsRecord.vue new file mode 100644 index 00000000..5556a7dc --- /dev/null +++ b/src/views/charts/charts/ChartDomainDnsRecord.vue @@ -0,0 +1,52 @@ + + + diff --git a/src/views/charts/charts/ChartDomainWhois.vue b/src/views/charts/charts/ChartDomainWhois.vue new file mode 100644 index 00000000..c52afe50 --- /dev/null +++ b/src/views/charts/charts/ChartDomainWhois.vue @@ -0,0 +1,54 @@ + + + From a6c5ee057d2880dd81ae9c70931f29227eea606c Mon Sep 17 00:00:00 2001 From: "@changcode" Date: Thu, 20 Jan 2022 11:47:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E7=89=B9=E6=AE=8A?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE=E4=B8=BA=E7=A9=BA=E6=98=AF?= =?UTF-8?q?=E7=9A=84=E5=88=A4=E6=96=AD=E6=9D=A1=E4=BB=B6=EF=BC=8C=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=E5=8D=95=E5=80=BC=E6=8A=98=E7=BA=BF=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/charts/PanelChart.vue | 1 - .../charts/ChartCryptocurrencyEventList.vue | 6 +- .../charts/charts/ChartDomainDnsRecord.vue | 6 +- src/views/charts/charts/ChartDomainWhois.vue | 12 ++-- src/views/charts/charts/ChartSingleValue.vue | 55 ++++++++++++++++++- 5 files changed, 65 insertions(+), 15 deletions(-) diff --git a/src/views/charts/PanelChart.vue b/src/views/charts/PanelChart.vue index 172a71ac..11155bd3 100644 --- a/src/views/charts/PanelChart.vue +++ b/src/views/charts/PanelChart.vue @@ -184,7 +184,6 @@ export default { const requestUrl = url || (chartParams && chartParams.url) if (requestUrl) { get(replaceUrlPlaceholder(requestUrl, this.queryParams)).then(response => { - console.log(testData) if (this.chartInfo.type === 23 && testData) { response = testData.data } else if (this.chartInfo.type === 24 && testData) { diff --git a/src/views/charts/charts/ChartCryptocurrencyEventList.vue b/src/views/charts/charts/ChartCryptocurrencyEventList.vue index bf50b6e5..e976b01a 100644 --- a/src/views/charts/charts/ChartCryptocurrencyEventList.vue +++ b/src/views/charts/charts/ChartCryptocurrencyEventList.vue @@ -9,10 +9,10 @@
- {{data ? data.message : '-'}}:{{ data ? data.serverIP : '-'}}
- {{data ? data.time : '-'}}      {{ data ? data.clientIP : '-'}}    + {{$_.get(data, "message") || '-'}}:{{$_.get(data, "serverIP") || '-'}}
+ {{$_.get(data, "time") || '-'}}      {{ $_.get(data, "clientIP") || '-'}}   
-     {{data ? data.serverIP : '-'}} +     {{$_.get(data, "serverIP") || '-'}}
diff --git a/src/views/charts/charts/ChartDomainDnsRecord.vue b/src/views/charts/charts/ChartDomainDnsRecord.vue index 5556a7dc..400623e7 100644 --- a/src/views/charts/charts/ChartDomainDnsRecord.vue +++ b/src/views/charts/charts/ChartDomainDnsRecord.vue @@ -10,9 +10,9 @@
Country
-
{{data ? data.type : '-'}}
-
{{data ? data.value : '-'}}
-
{{data ? data.country : '-'}}
+
{{$_.get(data, "type") || '-'}}
+
{{$_.get(data, "value") || '-'}}
+
{{$_.get(data, "country") || '-'}}
diff --git a/src/views/charts/charts/ChartDomainWhois.vue b/src/views/charts/charts/ChartDomainWhois.vue index c52afe50..981b5dc6 100644 --- a/src/views/charts/charts/ChartDomainWhois.vue +++ b/src/views/charts/charts/ChartDomainWhois.vue @@ -5,27 +5,27 @@
{{$t('entities.sponsor')}}
-
{{ chartData && chartData.registrar ? chartData.registrar : '-'}}
+
{{ $_.get(chartData, "registrar") || '-'}}
{{$t('entities.org')}}
-
{{chartData && chartData.org ? chartData.org : '-'}}
+
{{ $_.get(chartData, "org") || '-'}}
Email
-
{{chartData && chartData.postcode ? chartData.postcode : '-'}}
+
{{ $_.get(chartData, "email") || '-'}}
{{$t('overall.country')}}
-
{{chartData && chartData.country ? chartData.country : '-'}}
+
{{ $_.get(chartData, "country") || '-'}}
{{$t('entities.creationDate')}}
-
{{chartData ? parseMsDate(chartData.createTime) : '-'}}
+
{{ parseMsDate($_.get(chartData, "createTime")) || '-'}}
{{$t('entities.expirationDate')}}
-
{{chartData ? parseMsDate(chartData.expirationTime) : '-'}}
+
{{ parseMsDate($_.get(chartData, "expirationTime")) || '-'}}
diff --git a/src/views/charts/charts/ChartSingleValue.vue b/src/views/charts/charts/ChartSingleValue.vue index 46a2a086..3c1dfabf 100644 --- a/src/views/charts/charts/ChartSingleValue.vue +++ b/src/views/charts/charts/ChartSingleValue.vue @@ -61,7 +61,13 @@