diff --git a/src/layout/Layout1.vue b/src/layout/Layout1.vue index 850ab93..f280df3 100644 --- a/src/layout/Layout1.vue +++ b/src/layout/Layout1.vue @@ -53,7 +53,6 @@ html, body, #app { height: calc(100vh - 60px); overflow-y: auto; background-color: #f0f2f5; - box-sizing: border-box; } .view-container { diff --git a/src/router/index.js b/src/router/index.js index 02a9e72..47db52b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -10,53 +10,57 @@ const routes = [ children: [ { path: "/login", - component: () => import(`@/views/login/Index.vue`), - meta: { title: '登录' , permissions: [0,1]} + component: () => import(`@/views/login/Index.vue`) } ] }, + { + path: '/', + name: 'Layout1', + component: () => import('../layout/Layout1.vue'), + children: [ { - path: '/', + path: '', name: 'Layout', - component: () => import('@/components/Layout.vue'), + component: () => import('../components/Layout.vue'), redirect: 'home', children: [ { path: 'home', name: 'Home', - component: () => import('@/views/Home.vue'), - meta: { title: '首页' , permissions: [0,1]} + component: () => import('../views/Home.vue'), + meta: { title: '首页' } }, { path: 'medical', name: 'Medical', - component: () => import('@/views/medical/Index.vue'), + component: () => import('../views/medical/Index.vue'), redirect: 'medical/query', - meta: { title: '病历管理' , permissions: [0,1]}, + meta: { title: '病历管理' }, children: [ { path: 'input', name: 'MedicalInput', - component: () => import('@/views/medical/Input.vue'), - meta: { title: '病历录入' , permissions: [0,1]} + component: () => import('../views/medical/Input.vue'), + meta: { title: '病历录入' } }, { path: 'query', name: 'MedicalQuery', - component: () => import('@/views/medical/Query.vue'), - meta: { title: '病历查询' , permissions: [0,1]} + component: () => import('../views/medical/Query.vue'), + meta: { title: '病历查询' } }, { path: 'edit', name: 'MedicalEdit', - component: () => import('@/views/medical/Edit.vue'), - meta: { title: '病历修改' , permissions: [0,1]} + component: () => import('../views/medical/Edit.vue'), + meta: { title: '病历修改' } }, { path: 'delete', name: 'MedicalDelete', - component: () => import('@/views/medical/Delete.vue'), - meta: { title: '病历删除' , permissions: [0,1]} + component: () => import('../views/medical/Delete.vue'), + meta: { title: '病历删除' } } ] }, @@ -65,19 +69,19 @@ const routes = [ name: 'Consultation', component: () => import('../views/consultation/Index.vue'), redirect: 'consultation/inquiry', - meta: { title: '医慧咨询' , permissions: [0,1]}, + meta: { title: '医慧咨询' }, children: [ { path: 'inquiry', name: 'ConsultationInquiry', component: () => import('../views/consultation/Inquiry.vue'), - meta: { title: '病情询问' , permissions: [0,1]} + meta: { title: '病情询问' } }, { path: 'record', name: 'ConsultationRecord', component: () => import('../views/consultation/Record.vue'), - meta: { title: '病历记录' , permissions: [0,1]} + meta: { title: '病历记录' } } ] }, @@ -92,54 +96,58 @@ const routes = [ name: 'Template', component: () => import('../views/template/Index.vue'), redirect: 'template/query', - meta: { title: '病历模板' , permissions: [0,1]}, + meta: { title: '病历模板' }, children: [ { path: 'input', name: 'TemplateInput', component: () => import('../views/template/Input.vue'), - meta: { title: '模板录入' , permissions: [0,1]} + meta: { title: '模板录入' } }, { path: 'query', name: 'TemplateQuery', component: () => import('../views/template/Query.vue'), - meta: { title: '模板查询' , permissions: [0,1]} + meta: { title: '模板查询' } }, { path: 'edit', name: 'TemplateEdit', component: () => import('../views/template/Edit.vue'), - meta: { title: '模板修改' , permissions: [0,1]} + meta: { title: '模板修改' } }, { path: 'delete', name: 'TemplateDelete', component: () => import('../views/template/Delete.vue'), - meta: { title: '模板删除' , permissions: [0,1]} + meta: { title: '模板删除' } } ] }, + { path: 'data', name: 'Data', component: () => import('../views/Data.vue'), - meta: { title: '病历数据' , permissions: [0,1]} + meta: { title: '病历数据' } }, { path: 'ocr', name: 'OCR', component: () => import('../views/ocr/TextRecognition.vue'), - meta: { title: '文字识别' , permissions: [0,1]} + meta: { title: '文字识别' } }, { path: 'user', name: 'User', component: () => import('../views/user/User.vue'), - meta: { title: '用户管理' , permissions: [0] } + meta: { title: '用户管理' } } ] } + ] + }, + @@ -151,4 +159,5 @@ const router = createRouter({ }) + export default router diff --git a/src/views/user/User.vue b/src/views/user/User.vue index f9dd871..eaa11df 100644 --- a/src/views/user/User.vue +++ b/src/views/user/User.vue @@ -418,9 +418,6 @@ const deleteByIdsUser = () => { layout="jumper, total, sizes, prev, pager, next" background :total="total" @size-change="onSizeChange" @current-change="onCurrentChange" style="margin-top: 20px; justify-content: flex-end"/> - - - @@ -446,6 +443,6 @@ h2 { transform: translateX(100%); /**右移元素**/ -ms-transform: translateX(65%); - -webkit-transform: translateX(75%); + -webkit-transform: translateX(25%); }