From 5a2f90a16ea969022be66783c26178c83cfc484d Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 08 四月 2022 18:57:37 +0800
Subject: [PATCH] Merge branches 'master' and 'shf' of https://sinanoaq.cn:8888/r/ztqt into shf
---
src/views/layout/Layout.vue | 2 +-
src/views/layout/components/Institute.vue | 2 +-
src/router/index.js | 18 ++++++++++++++++--
3 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index dc7a871..62095f4 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -54,17 +54,31 @@
{
path: '/',
component: Layout,
- redirect: '/doublePreventAction/doublePreventAction/riskLevelManage/index/doublePreventAction/riskLevelManage/analyseUnit/index',
+ redirect: '/workPlan/workPlan/reserve',
children: [
{
path: 'dashboard',
- component: () => import('@/views/doublePreventAction/riskLevelManage/analyseUnit/index'),
+ component: () => import('@/views/workPlan/reserve'),
name: 'Dashboard1',
meta: { title: '首页', icon: 'el-icon-dash', noCache: true, affix: true }
}
],
hidden: true
},
+ // {
+ // path: '/',
+ // component: Layout,
+ // redirect: '/doublePreventAction/doublePreventAction/riskLevelManage/index/doublePreventAction/riskLevelManage/analyseUnit/index',
+ // children: [
+ // {
+ // path: 'dashboard',
+ // component: () => import('@/views/doublePreventAction/riskLevelManage/analyseUnit/index'),
+ // name: 'Dashboard1',
+ // meta: { title: '首页', icon: 'el-icon-dash', noCache: true, affix: true }
+ // }
+ // ],
+ // hidden: true
+ // },
{
path: 'dashboard',
component: Layout,
diff --git a/src/views/layout/Layout.vue b/src/views/layout/Layout.vue
index 565f06e..aad0930 100644
--- a/src/views/layout/Layout.vue
+++ b/src/views/layout/Layout.vue
@@ -45,7 +45,7 @@
return {
path: null,
WarningInfo: null,
- titleName: '众泰'
+ titleName: '众泰煤焦化智能化安全管理技术平台'
}
},
mounted() {
diff --git a/src/views/layout/components/Institute.vue b/src/views/layout/components/Institute.vue
index 02db0ef..5f54b62 100644
--- a/src/views/layout/components/Institute.vue
+++ b/src/views/layout/components/Institute.vue
@@ -1,7 +1,7 @@
<template>
<div class="app-breadcrumb">
<img :src="avatorPath">
- <h1> 众泰</h1>
+ <h1>众泰煤焦化智能化安全管理技术平台</h1>
</div>
<!-- <el-breadcrumb class="app-breadcrumb" separator="/">-->
<!-- <transition-group name="breadcrumb">-->
--
Gitblit v1.9.2