From bd0ae1d9e4ed39ad88f4ddcacef1efac599a2a5e Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Fri, 18 Mar 2022 11:13:14 +0800 Subject: [PATCH 1/5] ss --- src/assets/scss/main-shuju.scss | 8 ++ src/router/index.js | 35 +++++-- src/views/main-shuju/main-content.vue | 133 +++++++++++++++++--------- 3 files changed, 123 insertions(+), 53 deletions(-) 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 6ec6c657..0b1df15f 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -298,12 +298,14 @@ router.beforeEach((to, from, next) => { // url: "visual/basicinfo/basicInfoMain", children: [ { - url: "/visual/ai/index", + url: "https://epmet-dev.elinkservice.cn/epmet-oper-gov/#/", + // url: "/visual/ai/index", name: "AI安防", id: "5feawfwa111111efwa57", }, { - url: "/visual/ai/renliu", + url: "http://www.baidu.com", + // url: "/visual/ai/renliu", name: "人流数据", id: "5fwaefwae222112fawef58", }, @@ -477,12 +479,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..33bc09e8 100644 --- a/src/views/main-shuju/main-content.vue +++ b/src/views/main-shuju/main-content.vue @@ -1,98 +1,137 @@ - From 3b3bc96ec57a7cb1708a8c4bb4aaa59ea0f7568e Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Fri, 18 Mar 2022 14:12:41 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=B5=8C=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/main-shuju/main-content.vue | 29 +++++++++------------------ 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/src/views/main-shuju/main-content.vue b/src/views/main-shuju/main-content.vue index 33bc09e8..a67827be 100644 --- a/src/views/main-shuju/main-content.vue +++ b/src/views/main-shuju/main-content.vue @@ -11,17 +11,16 @@ '&customerId=' + customerId " - ref="iframes" + ref="iframe" class="m-iframe" - id="iframes" + id="iframe" width="100%" height="100%" - style="" frameborder="0" scrolling="yes" - > + /> - + @@ -39,10 +38,12 @@ export default { customerId: "", }; }, + watch: { + // "$router.currentRoute.name": function () { + // console.log($router.currentRoute); + // }, + }, created() { - // this.$nextTick(() => { - // this.sendMessage() - // }) this.token = localStorage.getItem("token"); this.customerId = localStorage.getItem("customerId"); }, @@ -118,18 +119,6 @@ export default { ); this.$router.push({ name: "home" }); }, - sendMessage() { - // const iframe = this.$refs.iframes.contentWindow - const iframe = - document.getElementsByClassName("iframes")[0].contentWindow; - - console.log("iframe", iframe); - // iframe.postMessage({ - // token: localStorage.getItem('token'), - // customerId: localStorage.getItem('customerId') - // }, '*') - iframe.postMessage({ name: "lalalal" }, "*"); - }, }, }; From 24cfd27404e10f1b2679cc32da66b2111656c9a1 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Fri, 18 Mar 2022 16:08:17 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=B5=8C=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index 0b1df15f..b8763839 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -298,14 +298,14 @@ router.beforeEach((to, from, next) => { // url: "visual/basicinfo/basicInfoMain", children: [ { - url: "https://epmet-dev.elinkservice.cn/epmet-oper-gov/#/", + url: "https://test-rxs-job.elinkservice.cn/haiqin-ai/aisecurity.html#/monitor-panel", // url: "/visual/ai/index", name: "AI安防", id: "5feawfwa111111efwa57", }, { - url: "http://www.baidu.com", - // url: "/visual/ai/renliu", + // url: "http://www.baidu.com", + url: "/visual/ai/renliu", name: "人流数据", id: "5fwaefwae222112fawef58", }, @@ -325,7 +325,8 @@ router.beforeEach((to, from, next) => { id: "fewafwafewaefddd", }, { - url: "/visual/ai/yujing", + // url: "/visual/ai/yujing", + url: "https://test-rxs-job.elinkservice.cn/haiqin-ai/aisecurity.html#/data-analysis", name: "预警事件", id: "545345fdsfs", }, From e6bcf53013e1db65688cf10fb0bfe36fac59bdad Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Mon, 21 Mar 2022 10:34:27 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index b8763839..9fdef7ab 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -303,27 +303,27 @@ router.beforeEach((to, from, next) => { name: "AI安防", id: "5feawfwa111111efwa57", }, - { - // url: "http://www.baidu.com", - url: "/visual/ai/renliu", - name: "人流数据", - id: "5fwaefwae222112fawef58", - }, - { - url: "/visual/ai/cheliu", - name: "车流数据", - id: "erawerwecsxefwaw", - }, - { - url: "/visual/ai/shebei", - name: "设备数据", - id: "zfzffewaf", - }, - { - url: "/visual/ai/gongdan", - name: "工单数据", - id: "fewafwafewaefddd", - }, + // { + // // url: "http://www.baidu.com", + // url: "/visual/ai/renliu", + // name: "人流数据", + // id: "5fwaefwae222112fawef58", + // }, + // { + // url: "/visual/ai/cheliu", + // name: "车流数据", + // id: "erawerwecsxefwaw", + // }, + // { + // url: "/visual/ai/shebei", + // name: "设备数据", + // id: "zfzffewaf", + // }, + // { + // url: "/visual/ai/gongdan", + // name: "工单数据", + // id: "fewafwafewaefddd", + // }, { // url: "/visual/ai/yujing", url: "https://test-rxs-job.elinkservice.cn/haiqin-ai/aisecurity.html#/data-analysis", From 4c6f7717ebc59d740974775ec3a9f270bf671b1a Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Mon, 21 Mar 2022 10:52:06 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E6=99=BA=E6=85=A7?= =?UTF-8?q?=E5=AE=89=E9=98=B2=E5=B8=82=E5=8C=97=E6=AD=A3=E5=BC=8F=E8=8F=9C?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index 9fdef7ab..3b9d5687 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -294,13 +294,13 @@ router.beforeEach((to, from, next) => { { icon: "icon-setting", id: "44rq22222q2222", - name: "AI安防", + name: "智慧安防", // url: "visual/basicinfo/basicInfoMain", children: [ { url: "https://test-rxs-job.elinkservice.cn/haiqin-ai/aisecurity.html#/monitor-panel", // url: "/visual/ai/index", - name: "AI安防", + name: "视频监控", id: "5feawfwa111111efwa57", }, // {