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

# Conflicts:
#	src/views/layout/slidebar.vue

src/router/router.js

@@ -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 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 msgPush = r => require.ensure([], () => r(require('../views/msgpush/msg-push.vue')), 'msg-push')
+
 
 import patientsRouters from './patients'
 
@@ -55,6 +57,17 @@ export default [{
             path: '/item-role',
             component: itemRole
         },
+      {
+        path: '/msg-push',
+        component: msgPush,
+        // redirect: 'msgpush/msg-push',
+      },
+      // {
+      //   path: '/followup',
+      //   name: 'followUp',
+      //   component: followUp,
+      //   redirect: 'followup/plan-manage/planList',
+      // },
         followRouters,
         patientsRouters,
     ]

src/views/layout/slidebar.vue

@@ -21,7 +21,7 @@
         </template>
         <template v-else>
           <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 }}
             </el-menu-item>
           </template>
@@ -37,11 +37,11 @@
 </template>
 <script>
   import utils from '@/utils/followup/followupUtils';
-import { mapGetters } from 'vuex'
-import { setTimeout } from 'timers'
-import { isNotEmptyUtils } from '../../utils/utils'
-let vm = null
-export default {
+  import { mapGetters } from 'vuex'
+  import { setTimeout } from 'timers'
+  import { isNotEmptyUtils } from '../../utils/utils'
+  let vm = null
+  export default {
     props: {
       storageIdType: {
         type: Number,
@@ -124,7 +124,7 @@ export default {
             icon: 'el-icon-message',
             index: 'msg-push',
             isMessageSend: true,
-                checkAuth: true
+            checkAuth: true,
           },
         ]
       }
@@ -214,16 +214,14 @@ export default {
 
           })
 
-
-
         }
 
       },
     }
-}
+  }
 </script>
 <style lang="scss">
-.slidebar-container {
+  .slidebar-container {
     display: block;
     position: absolute;
     left: 0;
@@ -280,7 +278,7 @@ export default {
         display: block;
       }
     }
-}
+  }
 </style>
 
 

src/views/msgpush/msg-push.vue

+<template>
+    <div>
+
+    </div>
+</template>
+
+<script>
+  export default {}
+</script>
+
+<style scoped lang="scss">
+
+</style>