diff --git a/.env.development b/.env.development
index ea2d4b8..3a6f3a8 100644
--- a/.env.development
+++ b/.env.development
@@ -4,6 +4,7 @@ ENV = 'development'
# base api
VUE_APP_BASE_API = '/dashboard'
-VUE_APP_BASE_API2 = 'http://39.101.188.84:9027'
+# VUE_APP_BASE_API2 = 'http://39.101.188.84:9027'
+VUE_APP_BASE_API2 = 'http://localhost:9035'
BASE_API = 'http://10.10.3.35:9070'
diff --git a/src/api/netWorkYq/index.js b/src/api/netWorkYq/index.js
new file mode 100644
index 0000000..75b1415
--- /dev/null
+++ b/src/api/netWorkYq/index.js
@@ -0,0 +1,48 @@
+import request from "@/utils/request.js";
+// 查询舆情走势图列表
+export function listYqzs(query) {
+ return request({
+ url: '/tcZz/netWorkYq/yqzs/ListNoToken',
+ method: 'get',
+ params: query
+ })
+}
+// 查询舆情信息量统计列表
+export function listYqxxlnum(query) {
+ return request({
+ url: '/tcZz/netWorkYq/yqxxlnum/list',
+ method: 'get',
+ params: query
+ })
+}
+// 查询舆情信息量统计明細列表
+export function listYqxxltj(query) {
+ return request({
+ url: '/tcZz/netWorkYq/yqxxltj/ListNoToken',
+ method: 'get',
+ params: query
+ })
+}
+// 查询舆情信息量统计明細详细
+export function getYqxxltj(id) {
+ return request({
+ url: '/tcZz/netWorkYq/yqxxltj/' + id,
+ method: 'get'
+ })
+}
+// 查询媒体类型列表
+export function listMtlx(query) {
+ return request({
+ url: '/tcZz/netWorkYq/mtlx/list',
+ method: 'get',
+ params: query
+ })
+}
+// 查询涉事类型列表
+export function listSslx(query) {
+ return request({
+ url: '/tcZz/netWorkYq/sslx/list',
+ method: 'get',
+ params: query
+ })
+}
diff --git a/src/api/networkSecurity/index.js b/src/api/networkSecurity/index.js
new file mode 100644
index 0000000..5597fe4
--- /dev/null
+++ b/src/api/networkSecurity/index.js
@@ -0,0 +1,152 @@
+import request from "@/utils/request.js";
+// 查询数据来源统计列表
+export function listDataSourceTj(query) {
+ return request({
+ url: '/tcZz/networkSecurity/DataSourceTj/list',
+ method: 'get',
+ params: query
+ })
+}
+// 查询硬探针、软探针列表
+export function listRyz(query) {
+ return request({
+ url: '/tcZz/networkSecurity/ryz/list',
+ method: 'get',
+ params: query
+ })
+}
+// 查询系统监测列表
+export function listXtjc(query) {
+ return request({
+ url: '/tcZz/networkSecurity/xtjc/ListNoToken',
+ method: 'get',
+ params: query
+ })
+}
+// 查询等保系统列表
+export function listDbxt(query) {
+ return request({
+ url: '/tcZz/networkSecurity/dbxt/list',
+ method: 'get',
+ params: query
+ })
+}
+// 查询等保单位列表
+export function listDbdw(query) {
+ return request({
+ url: '/tcZz/networkSecurity/dbdw/list',
+ method: 'get',
+ params: query
+ })
+}
+// 查询政府网站列表
+export function listZfwz(query) {
+ return request({
+ url: '/tcZz/networkSecurity/zfwz/list',
+ method: 'get',
+ params: query
+ })
+}
+// 查询监管单位和网站监测
+export function listJgdw(query) {
+ return request({
+ url: '/tcZz/networkSecurity/jgdw/ListNoToken',
+ method: 'get',
+ params: query
+ })
+}
+// 查询 IDC单位列表
+export function listIdcdw(query) {
+ return request({
+ url: '/tcZz/networkSecurity/idcdw/list',
+ method: 'get',
+ params: query
+ })
+}
+// 查询网络监测统计列表
+export function listWljgtj(query) {
+ return request({
+ url: '/tcZz/networkSecurity/wljgtj/list',
+ method: 'get',
+ params: query
+ })
+}
+// 查询网络监测列表
+export function listCybersecurity(query) {
+ return request({
+ url: '/tcZz/networkSecurity/cybersecurity/ListNoToken',
+ method: 'get',
+ params: query
+ })
+}
+// 查询网络监测详细
+export function getCybersecurity(id) {
+ return request({
+ url: '/tcZz/networkSecurity/cybersecurity/' + id,
+ method: 'get'
+ })
+}
+// 查询受攻击IPTOP5列表
+export function listTop5(query) {
+ return request({
+ url: '/tcZz/networkSecurity/top5/list',
+ method: 'get',
+ params: query
+ })
+}
+// 查询分布情况列表
+export function listFbqk(query) {
+ return request({
+ url: '/tcZz/networkSecurity/fbqk/list',
+ method: 'get',
+ params: query
+ })
+}
+// 查询地图统计列表
+export function listMap(query) {
+ return request({
+ url: '/tcZz/networkSecurity/map/list',
+ method: 'get',
+ params: query
+ })
+}
+// 查询安全隐患列表
+export function listAqyh(query) {
+ return request({
+ url: '/tcZz/networkSecurity/aqyh/list',
+ method: 'get',
+ params: query
+ })
+}
+// 查询通报完成情况列表
+export function listTbwc(query) {
+ return request({
+ url: '/tcZz/networkSecurity/tbwc/list',
+ method: 'get',
+ params: query
+ })
+}
+// 查询部门通报列表
+export function listBmtb(query) {
+ return request({
+ url: '/tcZz/networkSecurity/bmtb/list',
+ method: 'get',
+ params: query
+ })
+}
+// 查询最新隐患列表
+export function listZxyh(query) {
+ return request({
+ url: '/tcZz/networkSecurity/zxyh/list',
+ method: 'get',
+ params: query
+ })
+}
+// 查询通报处置列表
+export function listTbcz(query) {
+ return request({
+ url: '/tcZz/networkSecurity/tbcz/list',
+ method: 'get',
+ params: query
+ })
+}
\ No newline at end of file
diff --git a/src/api/wlSafe/index.js b/src/api/wlSafe/index.js
index 1303e3a..cb475a8 100644
--- a/src/api/wlSafe/index.js
+++ b/src/api/wlSafe/index.js
@@ -2,7 +2,7 @@ import request from "@/utils/request.js";
//数据来源
export function dataLY() {
return request({
- url: "/zongzhi/saftyscreen/source",
+ url: "/networkSecurity/DataSourceTj/list",
method: "get",
});
}
diff --git a/src/components/MyTable/index.vue b/src/components/MyTable/index.vue
index dc6fac0..32d3e3b 100644
--- a/src/components/MyTable/index.vue
+++ b/src/components/MyTable/index.vue
@@ -8,68 +8,70 @@
align="center"
/> -->
-
+ >
- {{ $filterDict(item.dictType,scope.row[item.value],item.dictType == 'town' ? true : false) }}
+ {{
+ dictType
+ ? $filterDict(
+ item.dictType,
+ scope.row[item.value],
+ item.dictType == "town" ? true : false
+ )
+ : scope.row[item.value]
+ }}
-
diff --git a/src/views/privateOrder/security/components/Earth.vue b/src/views/privateOrder/security/components/Earth.vue
index 1db74d6..7ba6f42 100644
--- a/src/views/privateOrder/security/components/Earth.vue
+++ b/src/views/privateOrder/security/components/Earth.vue
@@ -102,7 +102,7 @@ import { OrbitControls } from "three/examples/jsm/controls/OrbitControls";
import { TWEEN } from "three/examples/jsm/libs/tween.module.min.js";
import { inlandAttack, outlandAttack } from "@/api/common";
-import { mapAttack } from "@/api/wlSafe";
+import { listMap } from "@/api/networkSecurity";
export default {
filters: {
commaFilter(target) {
@@ -563,17 +563,17 @@ export default {
methods: {
//地图受攻击
mapList() {
- mapAttack({ pageSize: 20, pageNum: 1 }).then((res) => {
+ listMap({ pageSize: 20, pageNum: 1 }).then((res) => {
res.rows.forEach((value) => {
this.attackItem.forEach((value1, index1) => {
if (value1.country == value.name) {
- this.attackItem[index1].attackNum = value.attackCount;
+ this.attackItem[index1].attackNum = value.count;
return;
}
});
this.attackItemTwo.forEach((value2, index2) => {
if (value2.country == value.name) {
- this.attackItemTwo[index2].attackNum = value.attackCount;
+ this.attackItemTwo[index2].attackNum = value.count;
return;
}
});
diff --git a/src/views/privateOrder/security/components/ReportingStatistics.vue b/src/views/privateOrder/security/components/ReportingStatistics.vue
index 38afea6..42f2000 100644
--- a/src/views/privateOrder/security/components/ReportingStatistics.vue
+++ b/src/views/privateOrder/security/components/ReportingStatistics.vue
@@ -134,6 +134,9 @@