diff --git a/.env.development b/.env.development
index ba15f82..96d76c2 100644
--- a/.env.development
+++ b/.env.development
@@ -5,6 +5,6 @@ ENV = 'development'
VUE_APP_BASE_API = '/dashboard'
# VUE_APP_BASE_API2 = 'http://39.101.188.84:9027'
-VUE_APP_BASE_API2 = 'http://localhost:9035'
+VUE_APP_BASE_API2 = 'http://192.168.0.110:9035'
# VUE_APP_BASE_API2 = 'http://39.101.188.84:9035'
BASE_API = 'http://10.10.3.35:9070'
diff --git a/src/api/login.js b/src/api/login.js
new file mode 100644
index 0000000..652294d
--- /dev/null
+++ b/src/api/login.js
@@ -0,0 +1,15 @@
+import request from '@/utils/request'
+
+export function singleLoginOne() {
+ return request({
+ url: '/tcZz/networkEcology/singleLogin/login1',
+ method: 'get',
+ })
+}
+
+export function singleLoginTwo() {
+ return request({
+ url: '/tcZz/networkEcology/singleLogin/login2',
+ method: 'get',
+ })
+}
\ No newline at end of file
diff --git a/src/api/networkSecurity/index.js b/src/api/networkSecurity/index.js
index 4dc5066..30d618d 100644
--- a/src/api/networkSecurity/index.js
+++ b/src/api/networkSecurity/index.js
@@ -185,4 +185,37 @@ export function dataBmtb() {
url: '/tcZz/networkEcology/screen/screendept',
method: 'get',
})
-}
\ No newline at end of file
+}
+
+// 查询众测漏洞成果统计
+export function listZclds(query) {
+ return request({
+ url: '/tcZz/networkSecurity/zclds/list',
+ method: 'get',
+ params: query
+ })
+}
+// 查询众测单位排行榜
+export function listZcdwpm(query) {
+ return request({
+ url: '/tcZz/networkSecurity/zcdwpm/list',
+ method: 'get',
+ params: query
+ })
+}
+// 查询众测资产成果统计
+export function listZczccg(query) {
+ return request({
+ url: '/tcZz/networkSecurity/zczccg/getOne',
+ method: 'get',
+ params: query
+ })
+}
+// 查询资产列表
+export function listZclb(query) {
+ return request({
+ url: '/tcZz/networkSecurity/zclb/list',
+ method: 'get',
+ params: query
+ })
+ }
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index 4484781..99de5dd 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -18,6 +18,10 @@ export const constantRoutes = [
component: (resolve) => {
require(["@/views/privateOrder/security/index"], resolve);
},
+ // redirect: "/screen/security/index",
+ // children: [
+
+ // ]
},
{
path: "sentiment",
@@ -40,7 +44,40 @@ export const constantRoutes = [
require(["@/views/privateOrder/positiveEnergy/index"], resolve);
},
},
- ],
+ // {
+ // path: "index",
+ // name: "态势感知",
+ // component: (resolve) => {
+ // require(["@/views/privateOrder/security/index"], resolve);
+ // },
+ // },
+ {
+ path: "supplyChain",
+ name: "供应链管理",
+ component: (resolve) => {
+ require(["@/views/privateOrder/supplyChain"], resolve);
+ },
+ },
+ {
+ path: "disposeMeet",
+ name: "处置与应急",
+ component: (resolve) => {
+ require(["@/views/privateOrder/disposeMeet"], resolve);
+ },
+ },
+ ]
+ // children: [
+ // {
+ // path: "exhibition",
+ // name: "态势感知",
+ // component: (resolve) => {
+ // require(["@/views/privateOrder/index"], resolve);
+ // },
+ // redirect: "/screen/exhibition/security",
+
+ // },
+
+ // ],
},
];
export const asyncRoutes = [{ path: "*", redirect: "/404", hidden: true }];
diff --git a/src/styles/variables.scss b/src/styles/variables.scss
index 76c4470..c875c74 100644
--- a/src/styles/variables.scss
+++ b/src/styles/variables.scss
@@ -2,3 +2,5 @@ $ScreenWidth: 5120px; //页面整体高度
$ScreenHeight: 1160px; //页面整体宽度
$LeftWidth: 1527px; // 左侧内容栏宽度
$RightWidth: 1527px; // 右侧内容栏宽度
+$iframeWidth: 5090px; // iframe整体宽度
+$iframeHeight: 1030px; // iframe整体高度
diff --git a/src/views/privateOrder/Screen.vue b/src/views/privateOrder/Screen.vue
index fc293c0..7c58ff7 100644
--- a/src/views/privateOrder/Screen.vue
+++ b/src/views/privateOrder/Screen.vue
@@ -69,6 +69,18 @@