Skip to content

P
pica.cloud.web-education-admin
提交 030480f7 编写于 作者: yi.li's avatar yi.li
浏览文件
操作

Merge branch 'dev-patients-20190513' of... 

Merge branch 'dev-patients-20190513' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-patients-20190513
上级 f7684bbb 4ad6c051
隐藏空白字符变更
内嵌 并排
正在显示 包含 371 行增加 和 34 行删除
src/App.vue
浏览文件 @ 030480f7
<template> <template>
<div> <div>
<v-header :userName="userName" :portrait="portrait" :idType="idType"></v-header> <v-header :userName="userName" :portrait="portrait" :idType="idType"></v-header>
<v-slidebar :authList="authList" :tokenValue="token"></v-slidebar> <v-slidebar :authList="authList" :tokenValue="token"></v-slidebar>
<el-container> <el-container>
<div class="content" id="body-content"> <div class="content" id="body-content">
<transition name="router-fade" mode="out-in"> <transition name="router-fade" mode="out-in">
...@@ -48,7 +48,7 @@ export default { ...@@ -48,7 +48,7 @@ export default {
}, },
created() { created() {
vm = this vm = this
vm.getToken() // vm.getToken()
}, },
mounted() { mounted() {
......
src/router/patients.js
浏览文件 @ 030480f7
...@@ -10,11 +10,12 @@ const newPatient = r => require.ensure([], () => r(require('../views/patients/ne ...@@ -10,11 +10,12 @@ const newPatient = r => require.ensure([], () => r(require('../views/patients/ne
/*分组管理*/ /*分组管理*/
const labelsManage = r => require.ensure([], () => r(require('../views/patients/labels-manage/layout.vue')), 'labelsManage'); const labelsManage = r => require.ensure([], () => r(require('../views/patients/labels-manage/layout.vue')), 'labelsManage');
const labelsList = r => require.ensure([], () => r(require('../views/patients/labels-manage/labels-manage.vue')), 'labelsList'); const labelsList = r => require.ensure([], () => r(require('../views/patients/labels-manage/labels-list.vue')), 'labelsList');
const labelsDetail = r => require.ensure([], () => r(require('../views/patients/labels-manage/labels-detail.vue')), 'labelsDetail');
/*资料不全居民*/ /*资料不全居民*/
const halfDataManage = r => require.ensure([], () => r(require('../views/patients/half-data-manage/layout.vue')), 'halfDataManage'); const notCompleteManage = r => require.ensure([], () => r(require('../views/patients/not-complete/layout.vue')), 'halfDataManage');
const halfDataList = r => require.ensure([], () => r(require('../views/patients/half-data-manage/half-data-list.vue')), 'halfDataList'); const notCompleteList = r => require.ensure([], () => r(require('../views/patients/not-complete/not-complete-list.vue')), 'halfDataList');
const patientsRouters = { const patientsRouters = {
path: '/patients-manage', path: '/patients-manage',
...@@ -75,10 +76,10 @@ const patientsRouters = { ...@@ -75,10 +76,10 @@ const patientsRouters = {
path: 'labels-manage', path: 'labels-manage',
component: labelsManage, component: labelsManage,
name: 'labelsManage', name: 'labelsManage',
redirect: 'labels-manage/labels-manage', redirect: 'labels-manage/labels-list',
children: [ children: [
{ {
path: 'labels-manage', path: 'labels-list',
component: labelsList, component: labelsList,
name: 'labelsList', name: 'labelsList',
meta: { meta: {
...@@ -86,21 +87,30 @@ const patientsRouters = { ...@@ -86,21 +87,30 @@ const patientsRouters = {
keepAlive: false keepAlive: false
}, },
}, },
{
path: 'labels-detail',
component: labelsDetail,
name: 'labelsDetail',
meta: {
title: '分组详情',
keepAlive: false
},
},
], ],
meta: { meta: {
title: '分组管理', title: '分组管理',
}, },
}, },
{ {
path: 'half-data-manage', path: 'not-complete',
component: halfDataManage, component: notCompleteManage,
name: 'halfDataManage', name: 'notCompleteManage',
redirect: 'half-data-manage/half-data-list', redirect: 'not-complete/not-complete',
children: [ children: [
{ {
path: 'half-data-list', path: 'not-complete',
component: halfDataList, component: notCompleteList,
name: 'halfDataList', name: 'notCompleteList',
meta: { meta: {
title: '资料不全居民', title: '资料不全居民',
keepAlive: false keepAlive: false
......
src/views/layout/slidebar.vue
浏览文件 @ 030480f7
...@@ -87,12 +87,12 @@ export default { ...@@ -87,12 +87,12 @@ export default {
{ {
title: '分组管理', title: '分组管理',
icon: 'el-icon-setting', icon: 'el-icon-setting',
index: 'patients-manage/labels-manage/labels-manage' index: 'patients-manage/labels-manage/labels-list'
}, },
{ {
title: '资料不全居民', title: '资料不全居民',
icon: 'el-icon-setting', icon: 'el-icon-setting',
index: 'patients-manage/half-data-manage/half-data-list' index: 'patients-manage/not-complete/not-complete'
} }
] ]
} }
......
src/views/patients/half-data-manage/half-data-list.vue 已删除 100644 → 0
浏览文件 @ f7684bbb
<template>
<p>资料不全居民</p>
</template>
<script>
</script>
<style scoped>
</style>
src/views/patients/labels-manage/labels-detail.vue 0 → 100644
浏览文件 @ 030480f7
<template>
<div class="label-list-wrap label-detail-wrap">
<bread-crumb
:curmbFirst="curmbFirst"
:curmbSecond="curmbSecond"
:curmbThird="curmbThird"
:jumPathThird="jumPathThird">
</bread-crumb>
<div class="component-content screenSet" id="screenSet">
<div class="label-name">
<p class="title">分组名称：</p>
<p class="name">允小雀</p>
<p class="modify">修改</p>
<el-button type="danger" plain size="small" class="delete-label">删除分组</el-button>
</div>
<div class="label-member">
<p class="title">分组成员：</p>
<p class="member-number">888人</p>
<div class="right">
<el-button type="primary" size="small" class="create-new-label">添加居民</el-button>
<el-button type="default" size="small" class="create-new-label">批量删除</el-button>
</div>
</div>
<el-table
ref="multipleTable"
:data="tableData"
tooltip-effect="dark"
style="width: 100%"
@selection-change="handleSelectionChange">
<el-table-column
type="selection"
width="55">
</el-table-column>
<el-table-column
prop="name"
label="姓名"
width="120">
</el-table-column>
<el-table-column
prop="name"
label="性别"
width="120">
</el-table-column>
<el-table-column
prop="name"
label="年龄"
width="120">
</el-table-column>
<el-table-column
prop="dd"
label="诊断"
>
</el-table-column>
<el-table-column
prop="name"
width="120">
操作
</el-table-column>
</el-table>
</div>
</div>
</template>
<script>
import BreadCrumb from "@/components/breadcrumb.vue";
import * as commonUtil from "@/utils/utils";
export default {
data(){
return {
curmbFirst: "居民管理",
curmbSecond: "分组管理",
curmbThird: '分组详情',
jumPathThird: '/patients-manage/labels-manage/labels-list',
labelName: '',
tableData: [{
date: '2016-05-03',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄',
dd:'第三方说带飞的身份多少发生大幅度沙发上的说带飞说带飞的身份我跟如果如果'
}, {
date: '2016-05-02',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄'
}, {
date: '2016-05-04',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄'
}, {
date: '2016-05-01',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄'
}, {
date: '2016-05-08',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄'
}, {
date: '2016-05-06',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄'
}, {
date: '2016-05-07',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄'
}],
}
},
components: {
BreadCrumb,
},
// 挂载到Dom完成时
mounted: function() {
commonUtil.resizeHeight();
},
methods: {
handleSelectionChange(){
console.log('handleSelectionChange>>>>')
},
}
}
</script>
<style lang="less" scoped>
.label-detail-wrap{
.screenSet{
background: #fff;
padding: 30px;
display: flex;
flex-direction: column;
}
.label-name{
width: 100%; height: 45px;
border-bottom: 1px solid #efefef;
font-size: 14px;
line-height: 32px;
color: #606266;
p{
display: inline-block;
&.name{
color: #93969c;
padding: 0 15px;
}
&.modify{
color: #449284;
cursor: pointer;
}
}
.delete-label{
float: right;
}
}
.label-member{
width: 100%; height: 65px;
font-size: 14px;
color: #606266;
p{
display: inline-block;
line-height: 65px;
&.member-number{
padding: 0 15px;
color: #449284;
}
}
.right{
float: right;
padding-top: 16px;
}
}
}
</style>
src/views/patients/labels-manage/labels-list.vue 0 → 100644
浏览文件 @ 030480f7
<template>
<div class="label-list-wrap">
<bread-crumb :curmbFirst="curmbFirst" :curmbSecond="curmbSecond" ></bread-crumb>
<div class="component-content screenSet" id="screenSet">
<p class="top-title">分组管理</p>
<el-row :gutter="30" class="label-name-row">
<el-col :span="6">
<el-input v-model="labelName" placeholder="请输入分组名称" size="small"></el-input>
</el-col>
<el-col :span="6">
<el-button type="primary" size="small" class="create-new-label">查询</el-button>
<el-button type="default" size="small" class="create-new-label">重置</el-button>
</el-col>
<el-col :span="6" class="right">
<el-button type="primary" size="small" class="create-new-label">新建分组</el-button>
</el-col>
</el-row>
<p class="total-label">共：75个分组</p>
<div class="label-list">
<el-tag class="each-label" @click="goToDetail">高新区(34人)</el-tag>
<el-tag class="each-label">高血压(64人)</el-tag>
<el-tag class="each-label">权力的游戏(34人)</el-tag>
<el-tag class="each-label">端到端(34人)</el-tag>
<el-tag class="each-label">高新区(34人)</el-tag>
<el-tag class="each-label">高血压(64人)</el-tag>
<el-tag class="each-label">权力的游戏(34人)</el-tag>
<el-tag class="each-label">端到端(34人)</el-tag>
</div>
</div>
</div>
</template>
<script>
import BreadCrumb from "@/components/breadcrumb.vue";
import * as commonUtil from "@/utils/utils";
export default {
data(){
return {
curmbFirst: "居民管理",
curmbSecond: "分组管理",
labelName: '',
}
},
components: {
BreadCrumb,
},
created(){
// 获取分组列表
this.getLabelList();
},
// 挂载到Dom完成时
mounted: function() {
commonUtil.resizeHeight();
},
methods: {
getLabelList(){
console.log('获取分组列表...');
},
goToDetail(){
this.$router.push({path: '/patients-manage/labels-manage/labels-detail'})
}
}
}
</script>
<style lang="less" >
.label-list-wrap{
.screenSet{
background: #fff;
padding: 30px;
display: flex;
flex-direction: column;
}
.top-title{
font-size: 20px;
padding-bottom: 20px;
border-bottom: 1px solid #efefef;
}
.label-name-row{
margin-top: 10px;
.right{
float: right;
.create-new-label{
float: right;
}
}
}
.total-label{
font-size: 12px; padding: 30px 0 10px;
}
.label-list{
width: 100%;
height: 100%;
background: #fff;
border: 1px solid #efefef;
border-radius: 4px;
overflow: hidden;
overflow-y: scroll;
padding: 20px 10px;
.each-label{
margin: 0 10px 10px 0;
color: #449284;
background: rgba(68,146,132, .1);
border: 1px solid rgba(68,146,132, .2);
&:hover{
color: #fff;
background: #449284;
cursor: pointer;
}
}
/*定义滚动条高宽及背景 高宽分别对应横竖滚动条的尺寸*/
&::-webkit-scrollbar
{
width: 5px;
height: 5px;
background-color: #fff;
}
/*定义滚动条轨道 内阴影+圆角*/
&::-webkit-scrollbar-track
{
border-radius: 10px;
background-color: rgb(241, 239, 239);
}
/*定义滑块 内阴影+圆角*/
&::-webkit-scrollbar-thumb
{
border-radius: 10px;
-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.3);
background-color: #bbb;
}
}
}
</style>
src/views/patients/labels-manage/labels-manage.vue 已删除 100644 → 0
浏览文件 @ f7684bbb
<template>
<p>分组管理</p>
</template>
<script>
</script>
<style scoped>
</style>
src/views/patients/not-complete/not-complete-list.vue 0 → 100644
浏览文件 @ 030480f7
<template>
<section class="not-complete-wrap">
<bread-crumb
:curmbFirst="curmbFirst"
:curmbSecond="curmbSecond">
</bread-crumb>
<section class="not-complete-content screenSet">
<h1>资料不全居民</h1>
</section>
</section>
</template>
<script>
import BreadCrumb from '../../../components/breadcrumb.vue'
export default {
name: "not-complete",
components: {
BreadCrumb
},
data() {
return {
curmbFirst: '居民管理',
curmbSecond: '资料不全居民',
}
}
}
</script>
<style lang="scss" scoped>
.not-complete-wrap {
.not-complete-content {
padding: 10px;
background: #ffffff;
}
}
</style>
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或