@@ -508,7 +507,6 @@ input:focus {
margin-top: 10px;
width: 80px;
height: 80px;
- background: url('../../../assets/img/img.jpg');
border-radius: 50%;
.head {
diff --git a/src/pages/system/list/staffside.vue b/src/pages/system/list/staffside.vue
index da2ca0d..8af1bee 100644
--- a/src/pages/system/list/staffside.vue
+++ b/src/pages/system/list/staffside.vue
@@ -1,36 +1,34 @@
-
-
-
- - -
-
-
-
- 
-
-
- {{item.staffProfessionalArchitectureName}}
-
-
-
-
+
-
-
- {{item.staffProfessionalArchitectureName}}
-
-
-
-
+
+ + +
+
+
+
+
+
+
+ {{item.staffProfessionalArchitectureName}}
+
+
+
+
-
+
+
+ {{item.staffProfessionalArchitectureName}}
+
+
+
+
-
-
-
- {{item1.label}}
-
-
-
+
+
@@ -299,192 +297,5 @@ export default {
};
diff --git a/src/pages/system/list/stafftree.vue b/src/pages/system/list/stafftree.vue
deleted file mode 100644
index a0176ce..0000000
--- a/src/pages/system/list/stafftree.vue
+++ /dev/null
@@ -1,256 +0,0 @@
-
-
+
+
+ {{item1.label}}
+
+
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/router/permission.js b/src/router/permission.js
index 81ee4d8..17c5bca 100644
--- a/src/router/permission.js
+++ b/src/router/permission.js
@@ -8,7 +8,10 @@ router.beforeEach((to, from, next) => {
document.title = to.meta.title ? `${to.meta.title} | ${Setting.titleSuffix}` : Setting.titleSuffix;
const role = util.session.get(Setting.usernameKey);
if (!role && to.path !== '/login') {
- next('/login');
+ next({
+ path: '/login',
+ query: {redirect: to.fullPath}
+ })
} else if(role && to.path == '/login') {
next('/index')
} else {
diff --git a/src/setting.js b/src/setting.js
index dbe99e4..2163e6b 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -49,62 +49,9 @@ const Setting = {
/**
* 布局配置
* */
- // 侧边菜单宽度，单位 px，不可动态修改，需与 setting.less 的 @menuSideWidth 保持一致
- menuSideWidth: 256,
layout: {
// 需要隐藏顶栏的页面路径
hideNavList: [],
- // 侧边栏风格，可选值为 dark 或 light
- siderTheme: 'dark',
- // 顶栏风格，可选值为 light、dark 或 primary
- headerTheme: 'light',
- // 顶栏是否置顶，开启后会覆盖侧边栏，需开启 headerFix
- headerStick: false,
- // 是否开启多 Tabs 页签
- tabs: true,
- // 多 Tabs 页签是否显示图标，开启 tabs 时有效
- showTabsIcon: true,
- // 是否固定多 Tabs 多页签
- tabsFix: true,
- // 是否固定侧边栏
- siderFix: true,
- // 是否固定顶栏
- headerFix: true,
- // 是否在下滑时隐藏顶栏，需开启 headerFix，如果开启了 tabsFix，Tabs 也会被隐藏
- headerHide: false,
- // 是否显示顶部菜单栏
- // 一般来说，侧边的菜单栏足以满足大部分业务，如需动态切换侧边栏，可开启此选项启用顶部一级菜单，此时侧边栏将作为二级菜单
- headerMenu: false,
- // 侧边菜单栏是否开启手风琴模式
- menuAccordion: true,
- // 是否显示折叠侧边栏按钮，移动端下会自动强制开启
- showSiderCollapse: true,
- // 侧边菜单栏是否默认折起
- menuCollapse: false,
- // 侧边菜单折起时，是否在子菜单前显示父级菜单名称
- showCollapseMenuTitle: false,
- // 是否显示重载按钮
- showReload: true,
- // 是否显示搜索
- showSearch: true,
- // 是否显示通知
- showNotice: true,
- // 是否显示全屏
- showFullscreen: true,
- // 在手机访问时，是否在顶部显示小尺寸 logo
- showMobileLogo: true,
- // 是否显示全局面包屑，开启 headerMenu 时不可用
- showBreadcrumb: true,
- // 全局面包屑是否显示图标，开启 showBreadcrumb 时有效
- showBreadcrumbIcon: false,
- // 是否显示日志入口，开启与否，不影响日志记录，如不希望用户看到可关闭
- showLog: true,
- // 是否显示多语言
- showI18n: true,
- // 是否支持动态修改布局配置，移动端下会自动强制关闭
- enableSetting: true,
- // 退出登录时，是否二次确认
- logoutConfirm: true
},
/**
* 功能配置
diff --git a/src/styles/pages/tree.scss b/src/styles/pages/tree.scss
index f540890..b51c24a 100644
--- a/src/styles/pages/tree.scss
+++ b/src/styles/pages/tree.scss
@@ -2,7 +2,6 @@
$insideColor: rgba(245, 242, 255, 0.8); //内部节点的边框颜色
$outColor: rgba(255, 255, 255, 0.8); //外部节点的边框颜色
-//混合代码,提取item共同样式
@mixin public {
cursor: pointer;
font-size: 14px;
@@ -16,91 +15,96 @@ $outColor: rgba(255, 255, 255, 0.8); //外部节点的边框颜色
}
}
-.side_tree{
- width: 100%;
- font-size: 14px;
- color: #333;
+.side_view{
+ height: 600px;
+ padding: 40px 20px;
+ background-color: #fff;
+ overflow: auto;
+
i{
margin-left: 5px;
font-size: 17px;
+ color: $--color-primary;
}
span{
margin-left: 5px;
font-size: 14px;
}
-}
-.item {
- @include public;
- width: 100%;
- padding: 15px 0;
- background:rgba(255,255,255,1);
- box-shadow:1px 14px 29px 0px rgba(255,69,69,0.19);
- border-radius:10px;
- text-align: left;
- margin-top: 20px;
-}
-.empty{
- width: 25px;
-}
-.item:first{
- margin-top: 0;
-}
-.item1 {
- @include public;
- margin-top: 20px;
- margin-left: 23px;
-}
-.item2 {
- @include public;
- margin-top: 20px;
- margin-left:80px
-}
-.item3 {
- @include public;
- margin-top: 20px;
- margin-left:95px
-}
-.item2:hover{
- color: $--color-primary;
-}
-.edit{
- display: inline-block;
- width: 17px;
- height: 17px;
- background: url(../../../assets/svg/edit.svg) 0 0/cover no-repeat;
-}
-// 使三角形旋转动画
-.arrowTransform {
- transition: 0.4s;
- transform-origin: center;
- transform: rotateZ(0deg);
-}
-.arrowTransformReturn {
- transition: 0.4s;
- transform-origin: center;
- transform: rotateZ(90deg);
-}
-
-//复选框样式
-.checkBox {
- width: 14px;
- height: 14px;
- border-radius: 7px;
- margin-left: 10px;
- margin-right: 10px;
- border: 2px solid rgba(146, 120, 255, 1);
-}
-
-//当点击复选框时候切换背景图片
-.isActive {
- background: url('../../../assets/img/icon-yigouxuan.png');
- background-size: 14px 14px; /*按比例缩放*/
-}
+ .side_icon{
+ text-align: right;
+ i{
+ cursor:pointer;
+ font-size: 20px;
+ }
+ }
+ .side_tree{
+ width: 100%;
+ font-size: 14px;
+ color: #333;
-.side_icon{
- text-align: right;
+ .item {
+ @include public;
+ width: 100%;
+ padding: 15px 0;
+ background:rgba(255,255,255,1);
+ box-shadow:1px 14px 29px 0px rgba(255,69,69,0.19);
+ border-radius:10px;
+ text-align: left;
+ margin-top: 20px;
+ }
+ .empty{
+ width: 25px;
+ }
+ .item:first{
+ margin-top: 0;
+ }
+ .item1 {
+ @include public;
+ margin-top: 20px;
+ margin-left: 23px;
+ }
+ .item2 {
+ @include public;
+ margin-top: 20px;
+ margin-left:80px
+ }
+ .item3 {
+ @include public;
+ margin-top: 20px;
+ margin-left:95px
+ }
+ .item2:hover{
+ color: $--color-primary;
+ }
+ .edit{
+ display: inline-block;
+ width: 17px;
+ height: 17px;
+ background: url(../../../assets/svg/edit.svg) 0 0/cover no-repeat;
+ }
+ .arrowTransform {
+ transition: 0.4s;
+ transform-origin: center;
+ transform: rotateZ(0deg);
+ }
+ .arrowTransformReturn {
+ transition: 0.4s;
+ transform-origin: center;
+ transform: rotateZ(90deg);
+ }
+
+ .checkBox {
+ width: 14px;
+ height: 14px;
+ border-radius: 7px;
+ margin-left: 10px;
+ margin-right: 10px;
+ border: 2px solid rgba(146, 120, 255, 1);
+ }
+ }
+ &.second{
+ .item2{
+ margin-left: 50px;
+ }
+ }
}
-.side_icon i{
- cursor:pointer;
- font-size: 20px;
-}
\ No newline at end of file
- - -
-
-
-
-
-
- {{item.ischeck}}
-
- {{item.staffProfessionalArchitectureName}}
-
-
-
-
-
-
- {{item.ischeck}}
-
- {{item.staffProfessionalArchitectureName}}
-
-
-
-
-
-
-
-
- {{item1.ischeck}}
-
- {{item1.label}}
-
-
-
-