Skip to content

P
pica.cloud.web-education-admin
提交 2909743d 编写于 作者: yongbo.wang's avatar yongbo.wang
浏览文件
操作

Merge branch 'dev-patients-20190513' into release-0612 

# Conflicts:
#	src/views/layout/slidebar.vue
上级 bb8558a5 438a770c
隐藏空白字符变更
内嵌 并排
正在显示 包含 206 行增加 和 182 行删除
src/router/router.js
浏览文件 @ 2909743d
...@@ -10,6 +10,8 @@ const createComponent = r => require.ensure([], () => r(require('../views/educat ...@@ -10,6 +10,8 @@ const createComponent = r => require.ensure([], () => r(require('../views/educat
const roleManager = r => require.ensure([], () => r(require('../views/system/role.vue')),'role') const roleManager = r => require.ensure([], () => r(require('../views/system/role.vue')),'role')
const addManager = r => require.ensure([], () => r(require('../views/education/add-manager.vue')), 'add-manager') const addManager = r => require.ensure([], () => r(require('../views/education/add-manager.vue')), 'add-manager')
const itemRole = r => require.ensure([], () => r(require('../views/system/item-role.vue')), 'item-role') const itemRole = r => require.ensure([], () => r(require('../views/system/item-role.vue')), 'item-role')
const msgPush = r => require.ensure([], () => r(require('../views/msgpush/msg-push.vue')), 'msg-push')
import patientsRouters from './patients' import patientsRouters from './patients'
...@@ -55,6 +57,17 @@ export default [{ ...@@ -55,6 +57,17 @@ export default [{
path: '/item-role', path: '/item-role',
component: itemRole component: itemRole
}, },
{
path: '/msg-push',
component: msgPush,
// redirect: 'msgpush/msg-push',
},
// {
// path: '/followup',
// name: 'followUp',
// component: followUp,
// redirect: 'followup/plan-manage/planList',
// },
followRouters, followRouters,
patientsRouters, patientsRouters,
] ]
......
src/views/layout/slidebar.vue
浏览文件 @ 2909743d
<template> <template>
<div id="slidebar-container" class="slidebar-container"> <div id="slidebar-container" class="slidebar-container">
<el-menu :default-active="onRoutes" class="el-menu-vertical-demo" theme="dark" unique-opened router> <el-menu :default-active="onRoutes" class="el-menu-vertical-demo" theme="dark" unique-opened router>
<template v-for="(item,_index) in items"> <template v-for="(item,_index) in items">
<template v-if="item.subs"> <template v-if="item.subs">
<el-submenu :index=" 'index_' + _index" :key="item.index"> <el-submenu :index=" 'index_' + _index" :key="item.index">
<template slot="title"><i :class="item.icon"></i>{{item.title}}</template> <template slot="title"><i :class="item.icon"></i>{{item.title}}</template>
<el-menu-item v-for="(subItem,i) in item.subs" :key="i" :index="'/'+subItem.index"> <el-menu-item v-for="(subItem,i) in item.subs" :key="i" :index="'/'+subItem.index">
<i class="sub-icon" :class="subItem.icon"></i> <i class="sub-icon" :class="subItem.icon"></i>
{{subItem.title}} {{subItem.title}}
<p class="redNum" <p class="redNum"
v-if="subItem.title == '资料不全居民' v-if="subItem.title == '资料不全居民'
&&notCompleteCount &&notCompleteCount
&&$route.path!='/patients-manage/not-complete/uncompleted-list'" &&$route.path!='/patients-manage/not-complete/uncompleted-list'"
> >
<span v-if="notCompleteCount>999">+999</span> <span v-if="notCompleteCount>999">+999</span>
<span v-else>{{notCompleteCount}}</span> <span v-else>{{notCompleteCount}}</span>
</p> </p>
</el-menu-item> </el-menu-item>
</el-submenu> </el-submenu>
</template> </template>
<template v-else> <template v-else>
<template v-if="item.isMessageSend"> <template v-if="item.isMessageSend">
<el-menu-item :index="'/'" :key="item.index" @click="goToMessageSendPage(item.checkAuth)" class="set-normal-background"> <el-menu-item :index="'/'+item.index" :key="item.index" @click="goToMessageSendPage(item.checkAuth)" class="set-normal-background">
<i :class="item.icon"></i>{{ item.title }} <i :class="item.icon"></i>{{ item.title }}
</el-menu-item> </el-menu-item>
</template> </template>
<template v-else> <template v-else>
<el-menu-item :index="'/'+item.index" :key="item.index"> <el-menu-item :index="'/'+item.index" :key="item.index">
<i :class="item.icon"></i>{{ item.title }} <i :class="item.icon"></i>{{ item.title }}
</el-menu-item> </el-menu-item>
</template> </template>
</template> </template>
</template> </template>
</el-menu> </el-menu>
</div> </div>
</template> </template>
<script> <script>
import utils from '@/utils/followup/followupUtils'; import utils from '@/utils/followup/followupUtils';
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import { setTimeout } from 'timers' import { setTimeout } from 'timers'
import { isNotEmptyUtils } from '../../utils/utils' import { isNotEmptyUtils } from '../../utils/utils'
let vm = null let vm = null
export default { export default {
props: { props: {
storageIdType: { storageIdType: {
type: Number, type: Number,
default: 0 default: 0
}, },
tokenValue: { tokenValue: {
type: String type: String
}, },
authList: { authList: {
type: Object, type: Object,
default: () => {} default: () => {}
}, },
notCompleteCount: { notCompleteCount: {
type: Number, type: Number,
} }
}, },
data() { data() {
return { return {
items: [ items: [
{ {
title: '数据总览', title: '数据总览',
icon: 'el-icon-menu', icon: 'el-icon-menu',
index: 'home', index: 'home',
},{ },{
title: '教培项目', title: '教培项目',
icon: 'el-icon-message', icon: 'el-icon-message',
index: 'item', index: 'item',
subs: [ subs: [
{ {
title: '项目组件', title: '项目组件',
icon: 'el-icon-setting', icon: 'el-icon-setting',
index: 'item-component' index: 'item-component'
}, },
{ {
title: '项目管理', title: '项目管理',
icon: 'el-icon-setting', icon: 'el-icon-setting',
index: 'item-manager' index: 'item-manager'
}, },
]
},{
title: '系统管理',
icon: 'el-icon-menu',
index: 'system',
subs: [
{
title: '角色管理',
icon: 'el-icon-setting',
index: 'role'
}
]
},{
title: '居民管理',
icon: 'el-icon-patients-manage',
index: 'patients-manage',
subs: [
{
title: '我的居民',
icon: 'el-icon-setting',
index: 'patients-manage/mypatients-manage/patients-list'
},
{
title: '新增居民',
icon: 'el-icon-setting',
index: 'patients-manage/new-manage/new-patient'
},
{
title: '分组管理',
icon: 'el-icon-setting',
index: 'patients-manage/labels-manage/labels-list'
},
{
title: '资料不全居民',
icon: 'el-icon-setting',
index: 'patients-manage/not-complete/uncompleted-list'
}
]
},{
title: '消息推送',
icon: 'el-icon-message',
index: 'msg-push',
isMessageSend: true,
checkAuth: true
},
] ]
} },{
title: '系统管理',
icon: 'el-icon-menu',
index: 'system',
subs: [
{
title: '角色管理',
icon: 'el-icon-setting',
index: 'role'
}
]
},{
title: '居民管理',
icon: 'el-icon-patients-manage',
index: 'patients-manage',
subs: [
{
title: '我的居民',
icon: 'el-icon-setting',
index: 'patients-manage/mypatients-manage/patients-list'
},
{
title: '新增居民',
icon: 'el-icon-setting',
index: 'patients-manage/new-manage/new-patient'
},
{
title: '分组管理',
icon: 'el-icon-setting',
index: 'patients-manage/labels-manage/labels-list'
},
{
title: '资料不全居民',
icon: 'el-icon-setting',
index: 'patients-manage/not-complete/uncompleted-list'
}
]
},{
title: '消息推送',
icon: 'el-icon-message',
index: 'msg-push',
isMessageSend: true,
checkAuth: true,
},
]
}
}, },
computed: { computed: {
onRoutes() { onRoutes() {
return this.$route.path; return this.$route.path;
} }
}, },
created() { created() {
vm = this; vm = this;
}, },
mounted(){ mounted(){
if(vm.storageIdType==2){ if(vm.storageIdType==2){
vm.setFollowSide() vm.setFollowSide()
} }
}, },
watch: { watch: {
authList(newVal, oldVal){ authList(newVal, oldVal){
if(!newVal.P001) { // 项目管理 if(!newVal.P001) { // 项目管理
vm.items[1].subs[1].index = 'blank' vm.items[1].subs[1].index = 'blank'
} }
if(!newVal.P002) { // 组件管理 if(!newVal.P002) { // 组件管理
vm.items[1].subs[0].index = 'blank' vm.items[1].subs[0].index = 'blank'
} }
if(!newVal.P003) { // 角色管理 if(!newVal.P003) { // 角色管理
vm.items[2].subs[0].index = 'blank' vm.items[2].subs[0].index = 'blank'
} }
}, },
storageIdType(val,ov){ storageIdType(val,ov){
if(val==2){ if(val==2){
vm.setFollowSide() vm.setFollowSide()
...@@ -214,16 +214,14 @@ export default { ...@@ -214,16 +214,14 @@ export default {
}) })
} }
}, },
} }
} }
</script> </script>
<style lang="scss"> <style lang="scss">
.slidebar-container { .slidebar-container {
display: block; display: block;
position: absolute; position: absolute;
left: 0; left: 0;
...@@ -232,55 +230,55 @@ export default { ...@@ -232,55 +230,55 @@ export default {
width: 255px; width: 255px;
background: #06232C; background: #06232C;
.el-menu { .el-menu {
background: #06232C;
border-right: none;
.sub-icon {
font-size: 12px;
}
.el-menu-item, .el-submenu__title {
color: #8FA4AC;
}
.el-menu-item.is-active {
color: #fff;
background: #509284 !important
}
.el-menu-item:hover,
.el-submenu__title:hover,
.slidebar-container .el-menu .el-menu-item:hover,
.slidebar-container .el-menu .el-submenu__title:hover {
color: #fff;
background: #06232C; background: #06232C;
border-right: none; }
.sub-icon { // .el-menu-item:focus, .el-menu-item:hover {
font-size: 12px; // background: #06232C !important;
} // }
.el-menu-item, .el-submenu__title { .el-icon-patients-manage{
color: #8FA4AC; width: 17px;
} height: 17px;
.el-menu-item.is-active { background: url('../../assets/image/patients-icon.png');
color: #fff; margin: 0 8px 0 3px ;
background: #509284 !important background-size: 17px 17px;
} opacity: 0.6;
.el-menu-item:hover, }
.el-submenu__title:hover, .set-normal-background{
.slidebar-container .el-menu .el-menu-item:hover, background: #06232C;
.slidebar-container .el-menu .el-submenu__title:hover { }
color: #fff;
background: #06232C;
}
// .el-menu-item:focus, .el-menu-item:hover {
// background: #06232C !important;
// }
.el-icon-patients-manage{
width: 17px;
height: 17px;
background: url('../../assets/image/patients-icon.png');
margin: 0 8px 0 3px ;
background-size: 17px 17px;
opacity: 0.6;
}
.set-normal-background{
background: #06232C;
}
} }
.redNum { .redNum {
display: inline-block; display: inline-block;
border-radius: 10px; border-radius: 10px;
margin-left: 15px; margin-left: 15px;
background: #EE263E; background: #EE263E;
color: #fff; color: #fff;
font-size: 12px; font-size: 12px;
line-height: 12px; line-height: 12px;
/*padding: 5px 10px;*/ /*padding: 5px 10px;*/
padding: 2px 5px; padding: 2px 5px;
span { span {
display: block; display: block;
}
} }
} }
}
</style> </style>
src/views/msgpush/msg-push.vue 0 → 100644
浏览文件 @ 2909743d
<template>
<div>
</div>
</template>
<script>
export default {}
</script>
<style scoped lang="scss">
</style>
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或