diff --git a/src/assets/scss/buttonstyle.scss b/src/assets/scss/buttonstyle.scss
index 77608bb5..2eabacde 100644
--- a/src/assets/scss/buttonstyle.scss
+++ b/src/assets/scss/buttonstyle.scss
@@ -106,7 +106,7 @@
text-decoration: underline !important;
}
-//
+//
.div-table-button--qr {
color: #4ec591 !important;
text-decoration: underline !important;
diff --git a/src/assets/scss/main-shuju.scss b/src/assets/scss/main-shuju.scss
index 64eaa42c..092ff796 100644
--- a/src/assets/scss/main-shuju.scss
+++ b/src/assets/scss/main-shuju.scss
@@ -5,6 +5,14 @@
body {
}
+.m-iframe {
+ position: relative;
+ width: 100vw;
+ height: calc(100vh - 55px);
+ margin: -10px;
+ z-index: 100;
+}
+
/* Reset element-ui
------------------------------ */
.g-bd {
diff --git a/src/router/index.js b/src/router/index.js
index b74146b3..9712a81a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -319,11 +319,13 @@ router.beforeEach((to, from, next) => {
// url: "visual/basicinfo/basicInfoMain",
children: [
{
- url: "/visual/ai/index",
- name: "AI安防",
+ url: "https://test-rxs-job.elinkservice.cn/haiqin-ai/aisecurity.html#/monitor-panel",
+ // url: "/visual/ai/index",
+ name: "视频监控",
id: "5feawfwa111111efwa57",
},
- {
+ /*{
+ // url: "http://www.baidu.com",
url: "/visual/ai/renliu",
name: "人流数据",
id: "5fwaefwae222112fawef58",
@@ -342,10 +344,11 @@ router.beforeEach((to, from, next) => {
url: "/visual/ai/gongdan",
name: "工单数据",
id: "fewafwafewaefddd",
- },
+ },*/
{
- url: "/visual/ai/yujing",
- name: "预警事件",
+ // url: "/visual/ai/yujing",
+ url: "https://test-rxs-job.elinkservice.cn/haiqin-ai/aisecurity.html#/data-analysis",
+ name: "预警分析",
id: "545345fdsfs",
},
],
@@ -500,12 +503,33 @@ function fnAddDynamicMenuRoutes2(menuList = [], routes = []) {
eval(s2)
); // URL支持{{ window.xxx }}占位符变量
if (isURL(URL)) {
- route["path"] = route["name"] = `i-${menuList[i].id}`;
- route["meta"]["iframeURL"] = URL;
+ if (menuList[i].children && menuList[i].children.length >= 1) {
+ let item = menuList[i].children.find(
+ (subMenu) => subMenu.url == menuList[i].url
+ );
+ if (item) {
+ route["path"] = route["name"] = `i-${menuList[i].id}`;
+ route["redirect"] = `i-${item.id}`;
+ } else {
+ route["path"] = route["name"] = `i-${menuList[i].id}`;
+ route["meta"]["iframeURL"] = URL;
+ }
+ } else {
+ route["path"] = route["name"] = `i-${menuList[i].id}`;
+ route["meta"]["iframeURL"] = URL;
+ }
} else {
URL = URL.replace(/^\//, "").replace(/_/g, "-");
- route["path"] = route["name"] = URL.replace(/\//g, "-");
- route["component"] = () => import(`@/views/modules/${URL}`);
+ if (URL.startsWith("unopen")) {
+ route["path"] = route["name"] = URL.replace(/\//g, "-");
+ route["component"] = () => import(`@/views/modules/unopen`);
+ } else if (menuList[i].children && menuList[i].children.length >= 1) {
+ route["path"] = route["name"] = URL;
+ route["redirect"] = URL.replace(/\//g, "-");
+ } else {
+ route["path"] = route["name"] = URL.replace(/\//g, "-");
+ route["component"] = () => import(`@/views/modules/${URL}`);
+ }
}
routes.push(route);
}
diff --git a/src/views/main-shuju/main-content.vue b/src/views/main-shuju/main-content.vue
index e78235c6..a67827be 100644
--- a/src/views/main-shuju/main-content.vue
+++ b/src/views/main-shuju/main-content.vue
@@ -1,98 +1,126 @@