diff --git a/public/images/app/application.png b/public/images/app/application.png deleted file mode 100644 index b4f280118..000000000 Binary files a/public/images/app/application.png and /dev/null differ diff --git a/src/components/layout/Layout.vue b/src/components/layout/Layout.vue index 30df4b9da..63bd8bd46 100644 --- a/src/components/layout/Layout.vue +++ b/src/components/layout/Layout.vue @@ -146,7 +146,6 @@ profileEdit: 'nav.profileEdit', pointDetail: 'nav.pointDetail', pointEdit: 'nav.pointEdit', - application: 'nav.application', settings: 'nav.settings', settingsUser: 'nav.settingsUser', settingsRole: 'nav.settingsRole', diff --git a/src/config/i18n/locales/en.ts b/src/config/i18n/locales/en.ts index 810753cfa..ab8babb4e 100644 --- a/src/config/i18n/locales/en.ts +++ b/src/config/i18n/locales/en.ts @@ -78,7 +78,6 @@ export default { profileEdit: 'Profile Edit', pointDetail: 'Point Detail', pointEdit: 'Point Edit', - application: 'Application', settings: 'Settings', settingsUser: 'User', settingsRole: 'Role', diff --git a/src/config/i18n/locales/zh.ts b/src/config/i18n/locales/zh.ts index 3fae3c716..96bec5a64 100644 --- a/src/config/i18n/locales/zh.ts +++ b/src/config/i18n/locales/zh.ts @@ -78,7 +78,6 @@ export default { profileEdit: '模板编辑', pointDetail: '位号详情', pointEdit: '位号编辑', - application: '应用', settings: '设置', settingsUser: '用户管理', settingsRole: '角色管理', diff --git a/src/config/router/operate.ts b/src/config/router/operate.ts index 6bbf843af..01c04271a 100644 --- a/src/config/router/operate.ts +++ b/src/config/router/operate.ts @@ -26,21 +26,6 @@ const Layout = () => import('@/components/layout/Layout.vue'); * Includes detail and edit pages for various entities */ const routes: Array = [ - { - path: '/home', - component: Layout, - children: [ - { - name: 'application', - path: '/home/application', - meta: { - icon: 'el-icon-s-home', - title: 'Application', - }, - component: () => import('@/views/application/Application.vue'), - }, - ], - }, { path: '/driver', component: Layout, diff --git a/src/views/application/Application.vue b/src/views/application/Application.vue deleted file mode 100644 index ef5c40f35..000000000 --- a/src/views/application/Application.vue +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - diff --git a/src/views/application/index.ts b/src/views/application/index.ts deleted file mode 100644 index 16ae391ea..000000000 --- a/src/views/application/index.ts +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright 2016-present the IoT DC3 original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { computed, defineComponent } from 'vue'; -import { useRoute } from 'vue-router'; -import { decode } from 'js-base64'; -import { isUrl } from '@/utils/validationUtil'; - -export default defineComponent({ - props: { - url: { - type: String, - default: 'http://zhb_nyx.gitee.io/data-view', - }, - }, - setup(props) { - const route = useRoute(); - - const iframeUrl = computed(() => { - const id = route.query.id as string; - if (!id) return props.url; - - try { - const decodedUrl = decode(id); - return isUrl(decodedUrl) ? decodedUrl : props.url; - } catch { - return props.url; - } - }); - - return { - iframeUrl, - }; - }, -}); diff --git a/tests/e2e/fixtures/routes.ts b/tests/e2e/fixtures/routes.ts index 598be82e5..6c2252445 100644 --- a/tests/e2e/fixtures/routes.ts +++ b/tests/e2e/fixtures/routes.ts @@ -29,7 +29,6 @@ export interface RouteIds { export const protectedRoutes = [ '/home', - '/home/application', '/driver', '/profile', '/device',