From 2909696713b21077115009271f86cd5522af48aa Mon Sep 17 00:00:00 2001 From: jslyzx <821203886@qq.com> Date: Fri, 9 Aug 2019 17:07:20 +0800 Subject: [PATCH 001/667] =?UTF-8?q?=E6=94=AF=E6=89=A9=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 2 +- src/config/router.config.js | 2 +- src/mock/index.js | 1 + src/mock/services/element.js | 651 ++++++++++++++++++++++++++++++ src/permission.js | 2 +- src/utils/request.js | 2 +- src/views/dashboard/Workplace.vue | 387 +++--------------- 7 files changed, 717 insertions(+), 330 deletions(-) create mode 100644 src/mock/services/element.js diff --git a/.env b/.env index b5c472a6fd..6ef09dcada 100644 --- a/.env +++ b/.env @@ -1,3 +1,3 @@ NODE_ENV=production VUE_APP_PREVIEW=false -VUE_APP_API_BASE_URL=/api \ No newline at end of file +VUE_APP_API_BASE_URL=localhost:9996/zklm-web/ \ No newline at end of file diff --git a/src/config/router.config.js b/src/config/router.config.js index 386390bed8..5cb9408bc0 100644 --- a/src/config/router.config.js +++ b/src/config/router.config.js @@ -35,7 +35,7 @@ export const asyncRouterMap = [ path: '/dashboard/workplace', name: 'Workplace', component: () => import('@/views/dashboard/Workplace'), - meta: { title: '工作台', keepAlive: true, permission: [ 'dashboard' ] } + meta: { title: '工作台', keepAlive: true} } ] }, diff --git a/src/mock/index.js b/src/mock/index.js index 98824aed0e..f68097bb0c 100644 --- a/src/mock/index.js +++ b/src/mock/index.js @@ -11,6 +11,7 @@ if (process.env.NODE_ENV !== 'production' || process.env.VUE_APP_PREVIEW === 'tr require('./services/other') require('./services/tagCloud') require('./services/article') + require('./services/element') Mock.setup({ timeout: 800 // setter delay time diff --git a/src/mock/services/element.js b/src/mock/services/element.js new file mode 100644 index 0000000000..c744c9a515 --- /dev/null +++ b/src/mock/services/element.js @@ -0,0 +1,651 @@ +import Mock from 'mockjs2' +import { builder, getQueryParameters } from '../util' + + +const list = () => { + return builder({ + 'second': [ + { + "basisElementId": 1, + "hasChild": -1, + "isRadio": 0, + "isShow": 0, + "isWrite": -1, + "level": 1, + "questionName": "留全血", + "showType": 0, + "simple": 1, + "sort": 1, + "type": 1 + }, + { + "basisElementId": 2, + "hasChild": -1, + "isRadio": 0, + "isShow": 0, + "isWrite": -1, + "level": 1, + "questionName": "留血清", + "showType": 0, + "simple": 1, + "sort": 2, + "type": 1 + }, + { + "basisElementId": 3, + "hasChild": -1, + "isRadio": 0, + "isShow": 0, + "isWrite": 1, + "level": 1, + "questionName": "患者支扩确诊时间", + "showType": 0, + "simple": -1, + "sort": 3, + "type": 1 + }, + { + "basisElementId": 4, + "childList": [ + { + "basisElementId": 5, + "hasChild": -1, + "isRadio": 0, + "isShow": 0, + "isWrite": -1, + "level": 2, + "parentId": 4, + "questionName": "咳嗽", + "showType": 0, + "simple": -1, + "sort": 1, + "type": 2 + }, + { + "basisElementId": 6, + "childEleName": "", + "hasChild": -1, + "isRadio": 0, + "isShow": 0, + "isWrite": 1, + "level": 2, + "parentId": 4, + "questionName": "咳痰", + "showType": 0, + "simple": -1, + "sort": 1, + "type": 2, + "unit": "ml/日" + }, + { + "basisElementId": 7, + "childEleName": "", + "hasChild": -1, + "isRadio": 0, + "isShow": 0, + "isWrite": -1, + "level": 2, + "parentId": 4, + "questionName": "痰血", + "showType": 0, + "simple": -1, + "sort": 1, + "type": 2, + "unit": "" + }, + { + "basisElementId": 8, + "childEleName": "", + "hasChild": -1, + "isRadio": 0, + "isShow": 0, + "isWrite": 1, + "level": 2, + "parentId": 4, + "questionName": "咯血", + "showType": 0, + "simple": -1, + "sort": 1, + "type": 2, + "unit": "ml/日" + } + ], + "hasChild": 1, + "isRadio": -1, + "isShow": 0, + "isWrite": -1, + "level": 1, + "questionName": "主要临床症状：有无下列症状：（多选，勾选）", + "showType": 1, + "simple": -1, + "sort": 4, + "type": 1 + } + ], + 'seven': [ + { + "basisElementId": 9, + "childEleName": "", + "childList": [ + { + "basisElementId": 10, + "childEleName": "", + "childList": [ + { + "basisElementId": 11, + "childEleName": "", + "hasChild": -1, + "isRadio": 0, + "isShow": 0, + "isWrite": -1, + "level": 3, + "parentId": 10, + "questionName": "升高", + "showType": 0, + "simple": -1, + "sort": 1, + "type": 2, + "unit": "" + }, + { + "basisElementId": 12, + "childEleName": "", + "hasChild": -1, + "isRadio": 0, + "isShow": 0, + "isWrite": -1, + "level": 3, + "parentId": 10, + "questionName": "正常", + "showType": 0, + "simple": -1, + "sort": 2, + "type": 2, + "unit": "" + }, + { + "basisElementId": 13, + "childEleName": "", + "hasChild": -1, + "isRadio": 0, + "isShow": 0, + "isWrite": -1, + "level": 3, + "parentId": 10, + "questionName": "未测", + "showType": 0, + "simple": -1, + "sort": 3, + "type": 2, + "unit": "" + } + ], + "hasChild": 1, + "isRadio": 1, + "isShow": 0, + "isWrite": 1, + "level": 2, + "parentId": 9, + "questionName": "血嗜酸里细胞绝对值", + "showType": 1, + "simple": -1, + "sort": 1, + "type": 1, + "unit": "*10^9/L" + }, + { + "basisElementId": 14, + "childEleName": "", + "childList": [ + { + "basisElementId": 15, + "childEleName": "", + "hasChild": -1, + "isRadio": 0, + "isShow": 0, + "isWrite": -1, + "level": 3, + "parentId": 14, + "questionName": "升高", + "showType": 0, + "simple": -1, + "sort": 1, + "type": 2, + "unit": "" + }, + { + "basisElementId": 16, + "childEleName": "", + "hasChild": -1, + "isRadio": 0, + "isShow": 0, + "isWrite": -1, + "level": 3, + "parentId": 14, + "questionName": "正常", + "showType": 0, + "simple": -1, + "sort": 1, + "type": 2, + "unit": "" + }, + { + "basisElementId": 17, + "childEleName": "", + "hasChild": -1, + "isRadio": 0, + "isShow": 0, + "isWrite": -1, + "level": 3, + "parentId": 14, + "questionName": "未测", + "showType": 0, + "simple": -1, + "sort": 2, + "type": 2, + "unit": "" + } + ], + "hasChild": 1, + "isRadio": 1, + "isShow": 0, + "isWrite": 1, + "level": 2, + "parentId": 9, + "questionName": "血总IgE", + "showType": 1, + "simple": -1, + "sort": 2, + "type": 1, + "unit": "IU/mL" + }, + { + "basisElementId": 18, + "childEleName": "", + "childList": [ + { + "basisElementId": 19, + "childEleName": "", + "hasChild": -1, + "isRadio": 0, + "isShow": 0, + "isWrite": -1, + "level": 3, + "parentId": 18, + "questionName": "升高", + "showType": 0, + "simple": -1, + "sort": 1, + "type": 2, + "unit": "" + }, + { + "basisElementId": 20, + "childEleName": "", + "hasChild": -1, + "isRadio": 0, + "isShow": 0, + "isWrite": -1, + "level": 3, + "parentId": 18, + "questionName": "正常", + "showType": 0, + "simple": -1, + "sort": 2, + "type": 2, + "unit": "" + } + ], + "hasChild": 1, + "isRadio": 1, + "isShow": 0, + "isWrite": 1, + "level": 2, + "parentId": 9, + "questionName": "曲霉特异IgE", + "showType": 1, + "simple": -1, + "sort": 3, + "type": 1, + "unit": "IU/mL" + }, + { + "basisElementId": 21, + "childEleName": "", + "childList": [ + { + "basisElementId": 22, + "childEleName": "", + "hasChild": -1, + "isRadio": 0, + "isShow": 0, + "isWrite": -1, + "level": 3, + "parentId": 21, + "questionName": "升高", + "showType": 0, + "simple": -1, + "sort": 1, + "type": 2, + "unit": "" + }, + { + "basisElementId": 23, + "childEleName": "", + "hasChild": -1, + "isRadio": 0, + "isShow": 0, + "isWrite": -1, + "level": 3, + "parentId": 21, + "questionName": "正常", + "showType": 0, + "simple": -1, + "sort": 2, + "type": 2, + "unit": "" + }, + { + "basisElementId": 24, + "childEleName": "", + "hasChild": -1, + "isRadio": 0, + "isShow": 0, + "isWrite": -1, + "level": 3, + "parentId": 21, + "questionName": "未测", + "showType": 0, + "simple": -1, + "sort": 3, + "type": 2, + "unit": "" + } + ], + "hasChild": 1, + "isRadio": 1, + "isShow": 0, + "isWrite": 1, + "level": 2, + "parentId": 9, + "questionName": "曲霉特异IgG", + "showType": 1, + "simple": -1, + "sort": 4, + "type": 1, + "unit": "IU/mL" + }, + { + "basisElementId": 25, + "childEleName": "", + "childList": [ + { + "basisElementId": 26, + "childEleName": "", + "hasChild": -1, + "isRadio": 0, + "isShow": 0, + "isWrite": -1, + "level": 3, + "parentId": 25, + "questionName": "阳性", + "showType": 0, + "simple": -1, + "sort": 1, + "type": 2, + "unit": "" + }, + { + "basisElementId": 27, + "childEleName": "", + "hasChild": -1, + "isRadio": 0, + "isShow": 0, + "isWrite": -1, + "level": 3, + "parentId": 25, + "questionName": "正常", + "showType": 0, + "simple": -1, + "sort": 2, + "type": 2, + "unit": "" + }, + { + "basisElementId": 28, + "childEleName": "", + "hasChild": -1, + "isRadio": 0, + "isShow": 0, + "isWrite": -1, + "level": 3, + "parentId": 25, + "questionName": "未测", + "showType": 0, + "simple": -1, + "sort": 3, + "type": 2, + "unit": "" + } + ], + "hasChild": 1, + "isRadio": 1, + "isShow": 0, + "isWrite": -1, + "level": 2, + "parentId": 9, + "questionName": "曲霉皮肤点刺试验", + "showType": 1, + "simple": -1, + "sort": 5, + "type": 1, + "unit": "" + }, + { + "basisElementId": 29, + "childEleName": "", + "childList": [ + { + "basisElementId": 30, + "childEleName": "", + "hasChild": -1, + "isRadio": 0, + "isShow": 0, + "isWrite": -1, + "level": 3, + "parentId": 29, + "questionName": "有", + "showType": 0, + "simple": -1, + "sort": 1, + "type": 2, + "unit": "" + }, + { + "basisElementId": 31, + "childEleName": "", + "hasChild": -1, + "isRadio": 0, + "isShow": 0, + "isWrite": -1, + "level": 3, + "parentId": 29, + "questionName": "无", + "showType": 0, + "simple": -1, + "sort": 2, + "type": 2, + "unit": "" + }, + { + "basisElementId": 32, + "childEleName": "", + "hasChild": -1, + "isRadio": 0, + "isShow": 0, + "isWrite": -1, + "level": 3, + "parentId": 29, + "questionName": "未测", + "showType": 0, + "simple": -1, + "sort": 3, + "type": 2, + "unit": "" + } + ], + "hasChild": 1, + "isRadio": 1, + "isShow": 0, + "isWrite": -1, + "level": 2, + "parentId": 9, + "questionName": "胸部CT有无中心性支扩", + "showType": 1, + "simple": -1, + "sort": 6, + "type": 1, + "unit": "" + } + ], + "hasChild": 1, + "isRadio": 0, + "isShow": 1, + "isWrite": -1, + "level": 1, + "questionName": "ABPA", + "showType": 2, + "simple": 1, + "sort": 1, + "type": 1 + } + ], + 'ten': [ + { + "basisElementId": 33, + "childEleName": "", + "childList": [ + { + "basisElementId": 34, + "childEleName": "", + "childList": [ + { + "basisElementId": 35, + "hasChild": -1, + "isRadio": 0, + "isShow": 0, + "isWrite": -1, + "level": 3, + "parentId": 34, + "questionName": "阿奇霉素", + "showType": 1, + "simple": -1, + "sort": 1, + "type": 2 + }, + { + "basisElementId": 36, + "hasChild": -1, + "isRadio": 0, + "isShow": 0, + "isWrite": -1, + "level": 3, + "parentId": 34, + "questionName": "克拉霉素", + "showType": 0, + "simple": -1, + "sort": 2, + "type": 2 + }, + { + "basisElementId": 37, + "childEleName": "", + "hasChild": -1, + "isRadio": 0, + "isShow": 0, + "isWrite": -1, + "level": 3, + "parentId": 34, + "questionName": "红霉素", + "showType": 0, + "simple": -1, + "sort": 3, + "type": 2, + "unit": "" + }, + { + "basisElementId": 38, + "childEleName": "", + "hasChild": -1, + "isRadio": 0, + "isShow": 0, + "isWrite": -1, + "level": 3, + "parentId": 34, + "questionName": "青霉素", + "showType": 0, + "simple": -1, + "sort": 4, + "type": 2, + "unit": "" + }, + { + "basisElementId": 39, + "childEleName": "", + "hasChild": -1, + "isRadio": 0, + "isShow": 0, + "isWrite": 1, + "level": 3, + "parentId": 34, + "questionName": "其他", + "showType": 0, + "simple": -1, + "sort": 5, + "type": 2, + "unit": "" + } + ], + "hasChild": 1, + "isRadio": 1, + "isShow": 0, + "isWrite": -1, + "level": 2, + "parentId": 33, + "questionName": "周期性抗生素治疗", + "showType": 1, + "simple": -1, + "sort": 1, + "type": 1 + }, + { + "basisElementId": 40, + "hasChild": -1, + "isRadio": 0, + "isShow": 0, + "isWrite": 1, + "level": 2, + "parentId": 33, + "questionName": "吸入/雾化抗生素药物名称:", + "showType": 0, + "simple": -1, + "sort": 2, + "type": 1 + } + ], + "hasChild": 1, + "isRadio": -1, + "isShow": 1, + "isWrite": -1, + "level": 1, + "questionName": "有规律的呼吸疾病药物治疗", + "showType": 2, + "simple": 1, + "sort": 1, + "type": 1 + } + ] + }) +} + +Mock.mock(/\/element\/list/, 'get', list) diff --git a/src/permission.js b/src/permission.js index cdd178353f..55dd67c5bc 100644 --- a/src/permission.js +++ b/src/permission.js @@ -10,7 +10,7 @@ import { ACCESS_TOKEN } from '@/store/mutation-types' NProgress.configure({ showSpinner: false }) // NProgress Configuration -const whiteList = ['login', 'register', 'registerResult'] // no redirect whitelist +const whiteList = ['login', 'register', 'registerResult', 'Workplace'] // no redirect whitelist router.beforeEach((to, from, next) => { NProgress.start() // start progress bar diff --git a/src/utils/request.js b/src/utils/request.js index 8d23f9b217..8fb914c539 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -8,7 +8,7 @@ import { ACCESS_TOKEN } from '@/store/mutation-types' // 创建 axios 实例 const service = axios.create({ baseURL: process.env.VUE_APP_API_BASE_URL, // api base_url - timeout: 6000 // 请求超时时间 + timeout: 6000, // 请求超时时间 }) const err = (error) => { diff --git a/src/views/dashboard/Workplace.vue b/src/views/dashboard/Workplace.vue index 1d2e8fe767..2cbac1e059 100644 --- a/src/views/dashboard/Workplace.vue +++ b/src/views/dashboard/Workplace.vue @@ -1,244 +1,84 @@ From d1ec413f1bdce1957d577ef4ac2794fa8afc619b Mon Sep 17 00:00:00 2001 From: jslyzx <821203886@qq.com> Date: Fri, 9 Aug 2019 17:25:43 +0800 Subject: [PATCH 002/667] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/router.config.js | 4 ++-- src/layouts/BasicLayout.vue | 4 +++- src/main.js | 2 +- src/router/index.js | 4 ++-- src/utils/request.js | 9 ++++----- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/config/router.config.js b/src/config/router.config.js index 5cb9408bc0..3b12b278de 100644 --- a/src/config/router.config.js +++ b/src/config/router.config.js @@ -17,13 +17,13 @@ export const asyncRouterMap = [ name: 'dashboard', redirect: '/dashboard/workplace', component: RouteView, - meta: { title: '仪表盘', keepAlive: true, icon: bxAnaalyse, permission: [ 'dashboard' ] }, + meta: { title: '仪表盘', keepAlive: true, icon: bxAnaalyse}, children: [ { path: '/dashboard/analysis', name: 'Analysis', component: () => import('@/views/dashboard/Analysis'), - meta: { title: '分析页', keepAlive: false, permission: [ 'dashboard' ] } + meta: { title: '分析页', keepAlive: false} }, // 外部链接 { diff --git a/src/layouts/BasicLayout.vue b/src/layouts/BasicLayout.vue index 7cbf42118f..c72f9d3b9b 100644 --- a/src/layouts/BasicLayout.vue +++ b/src/layouts/BasicLayout.vue @@ -71,6 +71,7 @@ import SideMenu from '@/components/Menu/SideMenu' import GlobalHeader from '@/components/GlobalHeader' import GlobalFooter from '@/components/GlobalFooter' import SettingDrawer from '@/components/SettingDrawer' +import { asyncRouterMap } from '@/config/router.config.js' export default { name: 'BasicLayout', @@ -111,7 +112,8 @@ export default { } }, created () { - this.menus = this.mainMenu.find(item => item.path === '/').children + this.menus = asyncRouterMap.find((item) => item.path === '/').children + // this.menus = this.mainMenu.find(item => item.path === '/').children this.collapsed = !this.sidebarOpened }, mounted () { diff --git a/src/main.js b/src/main.js index 0055d797d3..33c1f969fc 100644 --- a/src/main.js +++ b/src/main.js @@ -12,7 +12,7 @@ import './mock' import bootstrap from './core/bootstrap' import './core/use' -import './permission' // permission control +// import './permission' // permission control import './utils/filter' // global filter Vue.config.productionTip = false diff --git a/src/router/index.js b/src/router/index.js index f0ba074d12..3141fa70e7 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,6 +1,6 @@ import Vue from 'vue' import Router from 'vue-router' -import { constantRouterMap } from '@/config/router.config' +import { constantRouterMap, asyncRouterMap } from '@/config/router.config' Vue.use(Router) @@ -8,5 +8,5 @@ export default new Router({ mode: 'history', base: process.env.BASE_URL, scrollBehavior: () => ({ y: 0 }), - routes: constantRouterMap + routes: constantRouterMap.concat(asyncRouterMap) }) diff --git a/src/utils/request.js b/src/utils/request.js index 8fb914c539..c21957e019 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -7,11 +7,14 @@ import { ACCESS_TOKEN } from '@/store/mutation-types' // 创建 axios 实例 const service = axios.create({ - baseURL: process.env.VUE_APP_API_BASE_URL, // api base_url + baseURL: 'http://localhost:9996/zklm-web', // api base_url timeout: 6000, // 请求超时时间 }) +service.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded' + const err = (error) => { + debugger if (error.response) { const data = error.response.data const token = Vue.ls.get(ACCESS_TOKEN) @@ -40,10 +43,6 @@ const err = (error) => { // request interceptor service.interceptors.request.use(config => { - const token = Vue.ls.get(ACCESS_TOKEN) - if (token) { - config.headers['Access-Token'] = token // 让每个请求携带自定义 token 请根据实际情况自行修改 - } return config }, err) From c8d1e6560e80487ecf87c67c58eb459f905adb9f Mon Sep 17 00:00:00 2001 From: jslyzx <821203886@qq.com> Date: Sun, 11 Aug 2019 17:00:47 +0800 Subject: [PATCH 003/667] =?UTF-8?q?=E5=9F=BA=E7=BA=BF=E8=A1=A8=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=EF=BC=8C=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + src/api/basis.js | 18 +++ src/api/login.js | 2 +- src/mock/services/element.js | 186 ++++++++++++++++++------------ src/utils/request.js | 7 +- src/views/dashboard/Workplace.vue | 86 +++++++++++--- vue.config.js | 27 +++-- yarn.lock | 5 + 8 files changed, 228 insertions(+), 104 deletions(-) create mode 100644 src/api/basis.js diff --git a/package.json b/package.json index 10ac546f0f..7e8eb85179 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "axios": "^0.19.0", "core-js": "^2.6.5", "enquire.js": "^2.1.6", + "jquery": "^3.4.1", "js-cookie": "^2.2.0", "lodash.get": "^4.4.2", "lodash.pick": "^4.4.0", diff --git a/src/api/basis.js b/src/api/basis.js new file mode 100644 index 0000000000..a4c92c4cb0 --- /dev/null +++ b/src/api/basis.js @@ -0,0 +1,18 @@ +import api from './index' +import { axios } from '@/utils/request' + +export function submit(params) { + return axios({ + url: '/basis/saveBasis', + method: 'post', + data: params + }) +} + +export function getElementsAnswer(params) { + return axios({ + url: '/basisMask/getElementsAnswer', + method: 'post', + data: params + }) +} \ No newline at end of file diff --git a/src/api/login.js b/src/api/login.js index 06f256b486..368ed0402e 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -58,4 +58,4 @@ export function get2step (parameter) { method: 'post', data: parameter }) -} +} \ No newline at end of file diff --git a/src/mock/services/element.js b/src/mock/services/element.js index c744c9a515..c85a982475 100644 --- a/src/mock/services/element.js +++ b/src/mock/services/element.js @@ -6,120 +6,164 @@ const list = () => { return builder({ 'second': [ { - "basisElementId": 1, - "hasChild": -1, - "isRadio": 0, - "isShow": 0, - "isWrite": -1, "level": 1, - "questionName": "留全血", - "showType": 0, + "answers": [ + { + "basisAnswerId": 12, + "patientBasisMarkId": 1, + "elementNumValue": 1, + "basisElementId": 1 + } + ], "simple": 1, + "questionName": "留全血", "sort": 1, - "type": 1 - }, - { - "basisElementId": 2, - "hasChild": -1, + "type": 1, "isRadio": 0, "isShow": 0, - "isWrite": -1, - "level": 1, - "questionName": "留血清", + "basisElementId": 1, + "hasChild": -1, "showType": 0, - "simple": 1, - "sort": 2, - "type": 1 + "isWrite": -1 }, { - "basisElementId": 3, - "hasChild": -1, + "level": 1, + "answers": [ + { + "basisAnswerId": 13, + "patientBasisMarkId": 1, + "elementNumValue": -1, + "basisElementId": 2 + } + ], + "simple": 1, + "questionName": "留血清", + "sort": 2, + "type": 1, "isRadio": 0, "isShow": 0, - "isWrite": 1, - "level": 1, - "questionName": "患者支扩确诊时间", + "basisElementId": 2, + "hasChild": -1, "showType": 0, + "isWrite": -1 + }, + { + "level": 1, + "answers": [ + { + "basisAnswerId": 14, + "elementTextValue": "2019-01-01", + "patientBasisMarkId": 1, + "basisElementId": 3 + } + ], "simple": -1, + "questionName": "患者支扩确诊时间", "sort": 3, - "type": 1 + "type": 1, + "isRadio": 0, + "isShow": 0, + "basisElementId": 3, + "hasChild": -1, + "showType": 0, + "isWrite": 1 }, { - "basisElementId": 4, + "level": 1, + "answers": [], "childList": [ { - "basisElementId": 5, - "hasChild": -1, - "isRadio": 0, - "isShow": 0, - "isWrite": -1, "level": 2, - "parentId": 4, - "questionName": "咳嗽", - "showType": 0, + "answers": [ + { + "basisAnswerId": 15, + "patientBasisMarkId": 1, + "elementNumValue": 1, + "basisElementId": 5 + } + ], "simple": -1, + "questionName": "咳嗽", "sort": 1, - "type": 2 - }, - { - "basisElementId": 6, - "childEleName": "", - "hasChild": -1, + "type": 2, "isRadio": 0, - "isShow": 0, - "isWrite": 1, - "level": 2, "parentId": 4, - "questionName": "咳痰", + "isShow": 0, + "basisElementId": 5, + "hasChild": -1, "showType": 0, + "isWrite": -1 + }, + { + "level": 2, + "answers": [ + { + "basisAnswerId": 16, + "elementTextValue": "100", + "patientBasisMarkId": 1, + "elementNumValue": 1, + "basisElementId": 6 + } + ], "simple": -1, + "questionName": "咳痰", "sort": 1, "type": 2, - "unit": "ml/日" - }, - { - "basisElementId": 7, - "childEleName": "", - "hasChild": -1, "isRadio": 0, - "isShow": 0, - "isWrite": -1, - "level": 2, "parentId": 4, - "questionName": "痰血", + "isShow": 0, + "childEleName": "", + "unit": "ml/日", + "basisElementId": 6, + "hasChild": -1, "showType": 0, + "isWrite": 1 + }, + { + "level": 2, + "answers": [], "simple": -1, + "questionName": "痰血", "sort": 1, "type": 2, - "unit": "" - }, - { - "basisElementId": 8, - "childEleName": "", - "hasChild": -1, "isRadio": 0, - "isShow": 0, - "isWrite": 1, - "level": 2, "parentId": 4, - "questionName": "咯血", + "isShow": 0, + "childEleName": "", + "unit": "", + "basisElementId": 7, + "hasChild": -1, "showType": 0, + "isWrite": -1 + }, + { + "level": 2, + "answers": [], "simple": -1, + "questionName": "咯血", "sort": 1, "type": 2, - "unit": "ml/日" + "isRadio": 0, + "parentId": 4, + "isShow": 0, + "childEleName": "", + "unit": "ml/日", + "basisElementId": 8, + "hasChild": -1, + "showType": 0, + "isWrite": 1 } ], - "hasChild": 1, + "simple": -1, + "questionName": "主要临床症状：有无下列症状：（多选，勾选）", + "sort": 4, + "type": 1, "isRadio": -1, "isShow": 0, - "isWrite": -1, - "level": 1, - "questionName": "主要临床症状：有无下列症状：（多选，勾选）", + "basisElementId": 4, + "hasChild": 1, "showType": 1, - "simple": -1, - "sort": 4, - "type": 1 + "isWrite": -1 } ], 'seven': [ diff --git a/src/utils/request.js b/src/utils/request.js index c21957e019..1c2dc8f33f 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -7,14 +7,11 @@ import { ACCESS_TOKEN } from '@/store/mutation-types' // 创建 axios 实例 const service = axios.create({ - baseURL: 'http://localhost:9996/zklm-web', // api base_url - timeout: 6000, // 请求超时时间 + baseURL: '/api', // api base_url + timeout: 6000 // 请求超时时间 }) -service.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded' - const err = (error) => { - debugger if (error.response) { const data = error.response.data const token = Vue.ls.get(ACCESS_TOKEN) diff --git a/src/views/dashboard/Workplace.vue b/src/views/dashboard/Workplace.vue index 2cbac1e059..2597bc1d81 100644 --- a/src/views/dashboard/Workplace.vue +++ b/src/views/dashboard/Workplace.vue @@ -1,38 +1,39 @@ + diff --git a/src/views/list/modules/CreateForm.vue b/src/views/list/modules/CreateForm.vue index c35c4554af..9bf03d906c 100644 --- a/src/views/list/modules/CreateForm.vue +++ b/src/views/list/modules/CreateForm.vue @@ -10,11 +10,42 @@ - + + + + + + + + 男 + 女 + + + + + From ddc246d73fe74e48c79c6f8ba72547bd68b7714a Mon Sep 17 00:00:00 2001 From: jslyzx <821203886@qq.com> Date: Tue, 13 Aug 2019 14:01:24 +0800 Subject: [PATCH 016/667] fdfd --- src/assets/avator.png | Bin 0 -> 696 bytes src/config/router.config.js | 193 ------------------------------------ 2 files changed, 193 deletions(-) create mode 100644 src/assets/avator.png diff --git a/src/assets/avator.png b/src/assets/avator.png new file mode 100644 index 0000000000000000000000000000000000000000..b1bd2e100f9698868fe1b19985ccca2387028530 GIT binary patch literal 696 zcmV;p0!RIcP)QIKorMcLL6MA;9v)Z zx;VJ#;NT(_hq^ilj#kA#K>P!&e}EKc!5^b2=q7cs4q_Lv4tCI?f*o|whAtfx&i71e z(=@r{E=?Q1@JQP&;)d4DF zdQ&$Q!#Hp?SaYV7MO!U=0OZ~QN;QB14PZVFkQ&0zeZqj-Xvi5SFrpUnnau})(@OjA z;{yQ4)5366Ek+SeS8cr|1VunjP$cTT?UGbV)AlhY>?yf7Z*U1M+rgGaTc~~e8-Ic# z|4dlHgl1yx%Se}(Ds`z|ORDDhN{U`dPz2|t+Yc$QzaEQ;UP-f#!b@Zw5}H+I(num3 z*c#{mXK~o@Ga0Et?0S082sdqv$+sN{jI=Z1Y@+o0aKC)Jnt3eBHb6JOm_ajrY}&`# zsC)|TV7jPP6h4iaNfUq|_NLlr?Fky}2!f~L!o7E`SV|J}1C)IR*teDWn>pj$<-1YD zSFy*I3a#c!W059{pP7tWv5v8#7ZlxW-{IXO`(#4n@wIN0BD>?$cRMUcc`Miv_kE<~ z?)1MPpUo5!pxeW(-+3A{twmp~VCTHv@+!y;80ryT8ET}QqoWqPAWA$Ox|N?!iUY1U z7&LpvoZiXEr+7vxTs1V;Q@iw%=(Z5au-@qYU#yb;*Sa#YEAdG0T||1fC(`?4z1mTX e>>lio00RJu import('@/views/profile/basic/Index'), - meta: { title: '基础详情页', permission: [ 'profile' ] } - }, - { - path: '/profile/advanced', - name: 'ProfileAdvanced', - component: () => import('@/views/profile/advanced/Advanced'), - meta: { title: '高级详情页', permission: [ 'profile' ] } - } - ] - }, - - // result - { - path: '/result', - name: 'result', - component: PageView, - redirect: '/result/success', - meta: { title: '结果页', icon: 'check-circle-o', permission: [ 'result' ] }, - children: [ - { - path: '/result/success', - name: 'ResultSuccess', - component: () => import(/* webpackChunkName: "result" */ '@/views/result/Success'), - meta: { title: '成功', keepAlive: false, hiddenHeaderContent: true, permission: [ 'result' ] } - }, - { - path: '/result/fail', - name: 'ResultFail', - component: () => import(/* webpackChunkName: "result" */ '@/views/result/Error'), - meta: { title: '失败', keepAlive: false, hiddenHeaderContent: true, permission: [ 'result' ] } - } - ] - }, - - // Exception - { - path: '/exception', - name: 'exception', - component: RouteView, - redirect: '/exception/403', - meta: { title: '异常页', icon: 'warning', permission: [ 'exception' ] }, - children: [ - { - path: '/exception/403', - name: 'Exception403', - component: () => import(/* webpackChunkName: "fail" */ '@/views/exception/403'), - meta: { title: '403', permission: [ 'exception' ] } - }, - { - path: '/exception/404', - name: 'Exception404', - component: () => import(/* webpackChunkName: "fail" */ '@/views/exception/404'), - meta: { title: '404', permission: [ 'exception' ] } - }, - { - path: '/exception/500', - name: 'Exception500', - component: () => import(/* webpackChunkName: "fail" */ '@/views/exception/500'), - meta: { title: '500', permission: [ 'exception' ] } - } - ] - }, - - // account - { - path: '/account', - component: RouteView, - redirect: '/account/center', - name: 'account', - meta: { title: '个人页', icon: 'user', keepAlive: true, permission: [ 'user' ] }, - children: [ - { - path: '/account/center', - name: 'center', - component: () => import('@/views/account/center/Index'), - meta: { title: '个人中心', keepAlive: true, permission: [ 'user' ] } - }, - { - path: '/account/settings', - name: 'settings', - component: () => import('@/views/account/settings/Index'), - meta: { title: '个人设置', hideHeader: true, permission: [ 'user' ] }, - redirect: '/account/settings/base', - hideChildrenInMenu: true, - children: [ - { - path: '/account/settings/base', - name: 'BaseSettings', - component: () => import('@/views/account/settings/BaseSetting'), - meta: { title: '基本设置', hidden: true, permission: [ 'user' ] } - }, - { - path: '/account/settings/security', - name: 'SecuritySettings', - component: () => import('@/views/account/settings/Security'), - meta: { title: '安全设置', hidden: true, keepAlive: true, permission: [ 'user' ] } - }, - { - path: '/account/settings/custom', - name: 'CustomSettings', - component: () => import('@/views/account/settings/Custom'), - meta: { title: '个性化设置', hidden: true, keepAlive: true, permission: [ 'user' ] } - }, - { - path: '/account/settings/binding', - name: 'BindingSettings', - component: () => import('@/views/account/settings/Binding'), - meta: { title: '账户绑定', hidden: true, keepAlive: true, permission: [ 'user' ] } - }, - { - path: '/account/settings/notification', - name: 'NotificationSettings', - component: () => import('@/views/account/settings/Notification'), - meta: { title: '新消息通知', hidden: true, keepAlive: true, permission: [ 'user' ] } - } - ] - } - ] - }, - - // other - { - path: '/other', - name: 'otherPage', - component: PageView, - meta: { title: '其他组件', icon: 'slack', permission: [ 'dashboard' ] }, - redirect: '/other/icon-selector', - children: [ - { - path: '/other/icon-selector', - name: 'TestIconSelect', - component: () => import('@/views/other/IconSelectorView'), - meta: { title: 'IconSelector', icon: 'tool', keepAlive: true, permission: [ 'dashboard' ] } - }, - { - path: '/other/list', - component: RouteView, - meta: { title: '业务布局', icon: 'layout', permission: [ 'support' ] }, - redirect: '/other/list/tree-list', - children: [ - { - path: '/other/list/tree-list', - name: 'TreeList', - component: () => import('@/views/other/TreeList'), - meta: { title: '树目录表格', keepAlive: true } - }, - { - path: '/other/list/edit-table', - name: 'EditList', - component: () => import('@/views/other/TableInnerEditList'), - meta: { title: '内联编辑表格', keepAlive: true } - }, - { - path: '/other/list/user-list', - name: 'UserList', - component: () => import('@/views/other/UserList'), - meta: { title: '用户列表', keepAlive: true } - }, - { - path: '/other/list/role-list', - name: 'RoleList', - component: () => import('@/views/other/RoleList'), - meta: { title: '角色列表', keepAlive: true } - }, - { - path: '/other/list/system-role', - name: 'SystemRole', - component: () => import('@/views/role/RoleList'), - meta: { title: '角色列表2', keepAlive: true } - }, - { - path: '/other/list/permission-list', - name: 'PermissionList', - component: () => import('@/views/other/PermissionList'), - meta: { title: '权限列表', keepAlive: true } - } - ] - } - ] } ] }, From 27e67b342091f1bf5a17bcbbbc34bb4e01685b70 Mon Sep 17 00:00:00 2001 From: jslyzx <821203886@qq.com> Date: Tue, 13 Aug 2019 16:16:08 +0800 Subject: [PATCH 017/667] =?UTF-8?q?=E8=B7=AF=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/router.config.js | 138 ++++++++---------------------------- src/views/account/index.vue | 0 src/views/case/index.vue | 0 src/views/gallery/index.vue | 0 src/views/group/index.vue | 0 src/views/task/index.vue | 0 6 files changed, 31 insertions(+), 107 deletions(-) create mode 100644 src/views/account/index.vue create mode 100644 src/views/case/index.vue create mode 100644 src/views/gallery/index.vue create mode 100644 src/views/group/index.vue create mode 100644 src/views/task/index.vue diff --git a/src/config/router.config.js b/src/config/router.config.js index 691d161cf0..8693eac48c 100644 --- a/src/config/router.config.js +++ b/src/config/router.config.js @@ -9,120 +9,44 @@ export const asyncRouterMap = [ name: 'index', component: BasicLayout, meta: { title: '首页' }, - redirect: '/dashboard/workplace', + redirect: '/dashboard/analysis', children: [ // dashboard { - path: '/dashboard', - name: 'dashboard', - redirect: '/dashboard/workplace', - component: RouteView, - meta: { title: '首页', keepAlive: true, icon: bxAnaalyse}, - children: [ - { - path: '/dashboard/analysis', - name: 'Analysis', - component: () => import('@/views/dashboard/Analysis'), - meta: { title: '分析页', keepAlive: false} - }, - // 外部链接 - { - path: 'https://www.baidu.com/', - name: 'Monitor', - meta: { title: '监控页（外部）', target: '_blank' } - }, - { - path: '/dashboard/workplace', - name: 'Workplace', - component: () => import('@/views/dashboard/Workplace'), - meta: { title: '工作台', keepAlive: true} - } - ] + path: '/dashboard/analysis', + name: 'Analysis', + component: () => import('@/views/dashboard/Analysis'), + meta: { title: '首页', keepAlive: true, icon: 'home'} }, - - // forms { - path: '/form', - redirect: '/form/base-form', - component: PageView, - meta: { title: '表单页', icon: 'form', permission: [ 'form' ] }, - children: [ - { - path: '/form/base-form', - name: 'BaseForm', - component: () => import('@/views/form/BasicForm'), - meta: { title: '基础表单', keepAlive: true, permission: [ 'form' ] } - }, - { - path: '/form/step-form', - name: 'StepForm', - component: () => import('@/views/form/stepForm/StepForm'), - meta: { title: '分步表单', keepAlive: true, permission: [ 'form' ] } - }, - { - path: '/form/advanced-form', - name: 'AdvanceForm', - component: () => import('@/views/form/advancedForm/AdvancedForm'), - meta: { title: '高级表单', keepAlive: true, permission: [ 'form' ] } - } - ] + path: '/case/index', + name: 'Case', + component: () => import('@/views/case/index'), + meta: { title: '病例管理', keepAlive: true, icon: 'home'} + }, + { + path: '/task/index', + name: 'Task', + component: () => import('@/views/task/index'), + meta: { title: '随访任务', keepAlive: true, icon: 'home'} + }, + { + path: '/gallery/index', + name: 'Gallery', + component: () => import('@/views/gallery/index'), + meta: { title: '报告采集', keepAlive: true, icon: 'home'} + }, + { + path: '/group/index', + name: 'Group', + component: () => import('@/views/group/index'), + meta: { title: '入组管理', keepAlive: true, icon: 'home'} }, - - // list { - path: '/list', - name: 'list', - component: PageView, - redirect: '/list/table-list', - meta: { title: '列表页', icon: 'table', permission: [ 'table' ] }, - children: [ - { - path: '/list/table-list/:pageNo([1-9]\\d*)?', - name: 'TableListWrapper', - hideChildrenInMenu: true, // 强制显示 MenuItem 而不是 SubMenu - component: () => import('@/views/list/TableList'), - meta: { title: '查询表格', keepAlive: true, permission: [ 'table' ] } - }, - { - path: '/list/basic-list', - name: 'BasicList', - component: () => import('@/views/list/StandardList'), - meta: { title: '标准列表', keepAlive: true, permission: [ 'table' ] } - }, - { - path: '/list/card', - name: 'CardList', - component: () => import('@/views/list/CardList'), - meta: { title: '卡片列表', keepAlive: true, permission: [ 'table' ] } - }, - { - path: '/list/search', - name: 'SearchList', - component: () => import('@/views/list/search/SearchLayout'), - redirect: '/list/search/article', - meta: { title: '搜索列表', keepAlive: true, permission: [ 'table' ] }, - children: [ - { - path: '/list/search/article', - name: 'SearchArticles', - component: () => import('../views/list/search/Article'), - meta: { title: '搜索列表（文章）', permission: [ 'table' ] } - }, - { - path: '/list/search/project', - name: 'SearchProjects', - component: () => import('../views/list/search/Projects'), - meta: { title: '搜索列表（项目）', permission: [ 'table' ] } - }, - { - path: '/list/search/application', - name: 'SearchApplications', - component: () => import('../views/list/search/Applications'), - meta: { title: '搜索列表（应用）', permission: [ 'table' ] } - } - ] - } - ] + path: '/account/index', + name: 'Account', + component: () => import('@/views/account/index'), + meta: { title: '账号管理', keepAlive: true, icon: 'home'} } ] }, diff --git a/src/views/account/index.vue b/src/views/account/index.vue new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/views/case/index.vue b/src/views/case/index.vue new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/views/gallery/index.vue b/src/views/gallery/index.vue new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/views/group/index.vue b/src/views/group/index.vue new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/views/task/index.vue b/src/views/task/index.vue new file mode 100644 index 0000000000..e69de29bb2 From 7f2705607b3e1d6d0f9c83645986d4100dcdc106 Mon Sep 17 00:00:00 2001 From: jslyzx <821203886@qq.com> Date: Tue, 13 Aug 2019 16:35:52 +0800 Subject: [PATCH 018/667] =?UTF-8?q?=E7=97=85=E4=BE=8B=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/router.config.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/config/router.config.js b/src/config/router.config.js index 8693eac48c..aaa7247434 100644 --- a/src/config/router.config.js +++ b/src/config/router.config.js @@ -19,10 +19,11 @@ export const asyncRouterMap = [ meta: { title: '首页', keepAlive: true, icon: 'home'} }, { - path: '/case/index', - name: 'Case', - component: () => import('@/views/case/index'), - meta: { title: '病例管理', keepAlive: true, icon: 'home'} + path: '/list/table-list/:pageNo([1-9]\\d*)?', + name: 'TableListWrapper', + hideChildrenInMenu: true, // 强制显示 MenuItem 而不是 SubMenu + component: () => import('@/views/list/TableList'), + meta: { title: '病例管理', keepAlive: true, icon: 'table'} }, { path: '/task/index', From 015b0d764079da9ad47d7b5d6c333d90f17b0813 Mon Sep 17 00:00:00 2001 From: ZhouYang <529110458@qq.com> Date: Thu, 15 Aug 2019 17:09:10 +0800 Subject: [PATCH 019/667] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=82=A3=E8=80=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/basis.js | 30 +++ src/views/list/modules/CreateForm.vue | 341 +++++++++++++++++++++----- 2 files changed, 305 insertions(+), 66 deletions(-) diff --git a/src/api/basis.js b/src/api/basis.js index a4c92c4cb0..27ce62406a 100644 --- a/src/api/basis.js +++ b/src/api/basis.js @@ -15,4 +15,34 @@ export function getElementsAnswer(params) { method: 'post', data: params }) +} +//获得省市 +export function getProvinceAndCity() { + return axios({ + url: '/dictionaryAttribute/getProvinceAndCity', + method: 'post' + }) +} +//获得民族 +export function getNation() { + return axios({ + url: '/dictionaryAttribute/getNation', + method: 'post' + }) +} +//根据字典ID获得内容 +export function getDictionaryAttributeByDictionaryId(params) { + return axios({ + url: '/dictionaryAttribute/getDictionaryAttributeByDictionaryId', + method: 'post', + data: params + }) +} +//提交患者信息 +export function addOrUpdate(params) { + return axios({ + url: '/patient/addOrUpdate', + method: 'post', + data: params + }) } \ No newline at end of file diff --git a/src/views/list/modules/CreateForm.vue b/src/views/list/modules/CreateForm.vue index 9bf03d906c..6c63e1131c 100644 --- a/src/views/list/modules/CreateForm.vue +++ b/src/views/list/modules/CreateForm.vue @@ -1,98 +1,307 @@ From 548d7140cab3aca29c21ed816da97304e7b73a9b Mon Sep 17 00:00:00 2001 From: jslyzx <821203886@qq.com> Date: Thu, 15 Aug 2019 17:11:07 +0800 Subject: [PATCH 020/667] =?UTF-8?q?=E7=97=85=E4=BE=8B=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- run.bat | 1 + src/api/patient.js | 21 +++++++++ src/components/Table/index.js | 8 ++-- src/layouts/BasicLayout.vue | 6 +-- src/views/list/TableList.vue | 81 +++++++++++++++++------------------ 5 files changed, 68 insertions(+), 49 deletions(-) create mode 100644 run.bat create mode 100644 src/api/patient.js diff --git a/run.bat b/run.bat new file mode 100644 index 0000000000..01150790ec --- /dev/null +++ b/run.bat @@ -0,0 +1 @@ +yarn run serve \ No newline at end of file diff --git a/src/api/patient.js b/src/api/patient.js new file mode 100644 index 0000000000..a6f52158b0 --- /dev/null +++ b/src/api/patient.js @@ -0,0 +1,21 @@ +import { axios } from '@/utils/request' + +const api = { + user: '/user', + role: '/role', + patient: '/patient', + permission: '/permission', + permissionNoPager: '/permission/no-pager', + orgTree: '/org/tree' +} + +export default api + + +export function getPatientList (parameter) { + return axios({ + url: '/patient/getDataList', + method: 'post', + params: parameter + }) +} diff --git a/src/components/Table/index.js b/src/components/Table/index.js index e1f2a1a408..0868a52c11 100644 --- a/src/components/Table/index.js +++ b/src/components/Table/index.js @@ -135,7 +135,7 @@ export default { loadData (pagination, filters, sorter) { this.localLoading = true const parameter = Object.assign({ - pageNo: (pagination && pagination.current) || + pageNumber: (pagination && pagination.current) || this.showPagination && this.localPagination.current || this.pageNum, pageSize: (pagination && pagination.pageSize) || this.showPagination && this.localPagination.pageSize || this.pageSize @@ -156,8 +156,8 @@ export default { if ((typeof result === 'object' || typeof result === 'function') && typeof result.then === 'function') { result.then(r => { this.localPagination = this.showPagination && Object.assign({}, this.localPagination, { - current: r.pageNo, // 返回结果中的当前分页数 - total: r.totalCount, // 返回结果中的总记录数 + current: r.current, // 返回结果中的当前分页数 + total: r.total, // 返回结果中的总记录数 showSizeChanger: this.showSizeChanger, pageSize: (pagination && pagination.pageSize) || this.localPagination.pageSize @@ -172,7 +172,7 @@ export default { // 这里用于判断接口是否有返回 r.totalCount 且 this.showPagination = true 且 pageNo 和 pageSize 存在 且 totalCount 小于等于 pageNo * pageSize 的大小 // 当情况满足时，表示数据不满足分页大小，关闭 table 分页功能 try { - if ((['auto', true].includes(this.showPagination) && r.totalCount <= (r.pageNo * this.localPagination.pageSize))) { + if ((['auto', true].includes(this.showPagination) && r.total <= (r.current * this.localPagination.pageSize))) { this.localPagination.hideOnSinglePage = true } } catch (e) { diff --git a/src/layouts/BasicLayout.vue b/src/layouts/BasicLayout.vue index c72f9d3b9b..3920b458ab 100644 --- a/src/layouts/BasicLayout.vue +++ b/src/layouts/BasicLayout.vue @@ -48,12 +48,12 @@ - + - + diff --git a/src/views/list/TableList.vue b/src/views/list/TableList.vue index 811c8aa09c..5f4b9349f8 100644 --- a/src/views/list/TableList.vue +++ b/src/views/list/TableList.vue @@ -46,18 +46,18 @@ - + {{ index + 1 }} - - -
+ + +

{{ pro.name }}

- +
- - 23% - + + 23% +
@@ -88,24 +88,24 @@ import moment from 'moment'; import { STable, Ellipsis } from '@/components'; import StepByStepModal from './modules/StepByStepModal'; import CreateForm from './modules/CreateForm'; -import { getRoleList, getServiceList } from '@/api/manage'; +import { getPatientList } from '@/api/patient'; -const statusMap = { +const visitMap = { 0: { status: 'default', - text: '关闭' + text: '忽略' }, 1: { status: 'processing', - text: '运行中' + text: '未执行' }, 2: { status: 'success', - text: '已上线' + text: '执行中' }, 3: { status: 'error', - text: '异常' + text: '已完成' } }; @@ -127,40 +127,31 @@ export default { // 表头 columns: [ { - title: '#', - scopedSlots: { customRender: 'serial' } + title: '档案号', + dataIndex: 'code' }, { - title: '规则编号', - dataIndex: 'no' + title: '患者姓名', + dataIndex: 'name' }, { - title: '描述', - dataIndex: 'description', - scopedSlots: { customRender: 'description' } + title: '身份证号', + dataIndex: 'card' }, { - title: '服务调用次数', - dataIndex: 'callNo', - sorter: true, - // needTotal: true, - customRender: text => text + ' 次' + title: '创建日期', + dataIndex: 'createDate', + customRender: createDate => moment(createDate).format('YYYY-MM-DD HH:mm:ss') }, { - title: '状态', - dataIndex: 'status', - scopedSlots: { customRender: 'status' } + title: '访视状态', + dataIndex: 'visit', + scopedSlots: { customRender: 'visit' } }, { - title: '进度', - dataIndex: 'pros', - width: '452px', - scopedSlots: { customRender: 'pros' } - }, - { - title: '更新时间', - dataIndex: 'updatedAt', - sorter: true + title: '访视进度', + dataIndex: 'basisList', + scopedSlots: { customRender: 'basisList' } }, { title: '操作', @@ -172,8 +163,8 @@ export default { // 加载数据方法 必须为 Promise 对象 loadData: parameter => { console.log('loadData.parameter', parameter); - return getServiceList(Object.assign(parameter, this.queryParam)).then(res => { - return res.result; + return getPatientList(Object.assign(parameter, this.queryParam)).then(res => { + return res; }); }, selectedRowKeys: [], @@ -201,10 +192,16 @@ export default { }, statusTypeFilter(type) { return statusMap[type].status; + }, + visitFilter(type) { + return visitMap[type].text; + }, + visitTypeFilter(type) { + return visitMap[type].status; } }, created() { - getRoleList({ t: new Date() }); + }, methods: { handleEdit(record) { @@ -259,7 +256,7 @@ export default { background-color: #e5f6ff; } .progressTag .ant-progress-span { - color: #e5f6ff; + color: rgb(0, 160, 233); } .tableSearch { background: #FFFFFF; From 8f2eb1bb77bfc6cc8840486c5ca95aeb533cd2a1 Mon Sep 17 00:00:00 2001 From: jslyzx <821203886@qq.com> Date: Fri, 16 Aug 2019 09:12:16 +0800 Subject: [PATCH 021/667] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E9=87=87=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/report.js | 16 +++ src/views/gallery/index.vue | 178 ++++++++++++++++++++++++++ src/views/list/TableList.vue | 44 ++++--- src/views/list/modules/CreateForm.vue | 2 +- 4 files changed, 218 insertions(+), 22 deletions(-) create mode 100644 src/api/report.js diff --git a/src/api/report.js b/src/api/report.js new file mode 100644 index 0000000000..49a75d6401 --- /dev/null +++ b/src/api/report.js @@ -0,0 +1,16 @@ +import { axios } from '@/utils/request' + +const api = { + reportCollectBase: '/reportCollectBase' +} + +export default api + + +export function getReportList (parameter) { + return axios({ + url: '/reportCollectBase/getDataList', + method: 'post', + params: parameter + }) +} diff --git a/src/views/gallery/index.vue b/src/views/gallery/index.vue index e69de29bb2..213b7274fe 100644 --- a/src/views/gallery/index.vue +++ b/src/views/gallery/index.vue @@ -0,0 +1,178 @@ + + + + diff --git a/src/views/list/TableList.vue b/src/views/list/TableList.vue index 5f4b9349f8..231658c189 100644 --- a/src/views/list/TableList.vue +++ b/src/views/list/TableList.vue @@ -233,31 +233,33 @@ export default { } }; - \ No newline at end of file diff --git a/src/assets/treeCard.png b/src/assets/treeCard.png new file mode 100644 index 0000000000000000000000000000000000000000..190577573f1d26ac001623b6c32951791bafd8ed GIT binary patch literal 585 zcmV-P0=E5$P)q$gGRCwBAWFQgz|Nq|rNCg0~JrIM~ z0$7wi0OAWkyb*{uFfuZJV4yYtIwS#z@Bb$ctOsHTYB|J#0*7F8m;xn^>HklC@E(W* zNOgz+5TE}~ThK6=90LRW#5idGfBJ$1e2!`OKQO=m<_1Qz^5s0kz<>+DvdR#|U_uh? zXBaqO0E;?CSXl$4_G44I<_QDC&KC>}pZ-v8s}>&vL#Pad##XumLrD?lp!q-wBXM2( z#K7Qrn7TnB!^yyK)Cs3_AS}wT7F3^pQ$KE=e8(&8&jO7u0j$2^VqkC+M?{yUFs7Q1 zzab%sD>P)eP{po(#OojjMresy&oD>;D9Yp+1`z-`NMSHJh=q^>Q2Kx+ZVO@TYEHaG zWNSWF>KgLY7gAP!u9D4qPkzw0QMurzZ;Ef0d9+v-LaU#J77GQ;T09ZJFz*Sn4 z0ze_rdJ{caGLmA%0hsO$xN-!w0gjp;1{N|BYMfEC`2i|_k`?hcKL)ZbjkRr!+=K;H zA@>JO6BZ}{Dvufm$U%uiqZ>2;9mV-WuPZ$$2O9?Ma10d(tmYFtV8uv=!)Q9B2M}NY X6-(wDm&h+E00000NkvXXu0mjf-X!H^ literal 0 HcmV?d00001 diff --git a/src/assets/treeTop.png b/src/assets/treeTop.png new file mode 100644 index 0000000000000000000000000000000000000000..0f0d70dc8bdad29b64cd5eab25498b21899c5ae6 GIT binary patch literal 3286 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 Du&E%B literal 0 HcmV?d00001 diff --git a/src/components/Tree/Tree.jsx b/src/components/Tree/Tree.jsx index e5a2a11391..10d8bdc4d6 100644 --- a/src/components/Tree/Tree.jsx +++ b/src/components/Tree/Tree.jsx @@ -17,7 +17,7 @@ export default { search: { type: Boolean, default: false - } + }, }, created () { this.localOpenKeys = this.openKeys.slice(0) @@ -46,11 +46,18 @@ export default { renderIcon (icon) { return icon && () || null }, + renderTreeIcon(percentage){ + if(parseInt(percentage)==0||!percentage||percentage=='') return () + if(parseInt(percentage)<100) return () + if(parseInt(percentage)==100) return () + }, renderMenuItem (item) { return ( + {this.renderTreeIcon(item.percentage)} { this.renderIcon(item.icon) } - { item.title } + { item.title } + {item.percentage} this.handlePlus(item) } }}> ) @@ -87,8 +94,10 @@ export default { const title = ( + {this.renderTreeIcon(item.percentage)} { this.renderIcon(item.icon) } - { item.title } + { item.title } + {item.percentage} ) @@ -115,7 +124,8 @@ export default { return (
{ search ? this.renderSearch() : null } - this.$emit('click', item), 'update:openKeys': val => { this.localOpenKeys = val } } }} openKeys={this.localOpenKeys}> +
支扩研究基线表
+ this.$emit('click', item), 'update:openKeys': val => { this.localOpenKeys = val } } }} openKeys={this.localOpenKeys}> { list }
diff --git a/src/mock/services/other.js b/src/mock/services/other.js index 83a5792992..c66e21533f 100644 --- a/src/mock/services/other.js +++ b/src/mock/services/other.js @@ -2,82 +2,55 @@ import Mock from 'mockjs2' import { builder } from '../util' const orgTree = () => { - return builder([{ - 'key': 'key-01', - 'title': '研发中心', - 'icon': 'mail', - 'children': [{ - 'key': 'key-01-01', - 'title': '后端组', - 'icon': null, - 'group': true, - children: [{ - 'key': 'key-01-01-01', - 'title': 'JAVA', - 'icon': null - }, - { - 'key': 'key-01-01-02', - 'title': 'PHP', - 'icon': null - }, - { - 'key': 'key-01-01-03', - 'title': 'Golang', - 'icon': null - } - ] - }, { - 'key': 'key-01-02', - 'title': '前端组', - 'icon': null, - 'group': true, - children: [{ - 'key': 'key-01-02-01', - 'title': 'React', - 'icon': null - }, - { - 'key': 'key-01-02-02', - 'title': 'Vue', - 'icon': null - }, - { - 'key': 'key-01-02-03', - 'title': 'Angular', - 'icon': null - } - ] - }] - }, { - 'key': 'key-02', - 'title': '财务部', - 'icon': 'dollar', - 'children': [{ - 'key': 'key-02-01', - 'title': '会计核算', - 'icon': null - }, { - 'key': 'key-02-02', - 'title': '成本控制', - 'icon': null - }, { - 'key': 'key-02-03', - 'title': '内部控制', - 'icon': null, - 'children': [{ - 'key': 'key-02-03-01', - 'title': '财务制度建设', - 'icon': null - }, - { - 'key': 'key-02-03-02', - 'title': '会计核算', - 'icon': null - } - ] - }] - }]) + return builder([ + { + "title": "支扩病史资料", + "percentage": "100%", + "key": "key-01" + }, + { + "title": "体格检查", + "percentage": "40%", + "key": "key-02" + }, + { + "title": "辅助检查", + "percentage": "", + "key": "key-03", + "children": [ + { + "title": "胸部影像学", + "percentage": "20%", + "key": "key-03-01" + }, + { + "title": "病原微生物检查", + "percentage": "", + "key": "key-03-02" + }, + { + "title": "病因学相关检查", + "percentage": "", + "key": "key-03-03" + }, + { + "title": "肺功能相关检查", + "percentage": "", + "key": "key-03-04" + }, + { + "title": "心脏彩超", + "percentage": "", + "key": "key-03-05" + }, + { + "title": "心脏彩超", + "percentage": "", + "key": "key-03-06" + } + ] + } +]) } const role = () => { diff --git a/src/views/account/center/Index.vue b/src/views/account/center/Index.vue index afa4fe2ef6..3836d166f8 100644 --- a/src/views/account/center/Index.vue +++ b/src/views/account/center/Index.vue @@ -1,288 +1,286 @@ - diff --git a/src/views/list/modules/CreateForm.vue b/src/views/list/modules/CreateForm.vue index 6c63e1131c..d060f84d6d 100644 --- a/src/views/list/modules/CreateForm.vue +++ b/src/views/list/modules/CreateForm.vue @@ -1,5 +1,5 @@ + @@ -65,6 +65,7 @@ import moment from 'moment'; import { STable, Ellipsis } from '@/components'; import { getReportList } from '@/api/report'; +import RegisterForm from './modules/RegisterForm'; const statusMap = { 0: { @@ -85,7 +86,8 @@ export default { name: 'TableList', components: { STable, - Ellipsis + Ellipsis, + RegisterForm, }, data() { return { @@ -169,7 +171,10 @@ export default { methods: { toggleAdvanced() { this.advanced = !this.advanced; - } + }, + handleOk() { + this.$refs.table.refresh(); + }, } }; diff --git a/src/views/gallery/modules/RegisterForm.vue b/src/views/gallery/modules/RegisterForm.vue new file mode 100644 index 0000000000..5344d4fb07 --- /dev/null +++ b/src/views/gallery/modules/RegisterForm.vue @@ -0,0 +1,127 @@ + + + diff --git a/src/views/gallery/modules/UserList.vue b/src/views/gallery/modules/UserList.vue new file mode 100644 index 0000000000..ee19c575d7 --- /dev/null +++ b/src/views/gallery/modules/UserList.vue @@ -0,0 +1,103 @@ + + + diff --git a/src/views/list/modules/CreateForm.vue b/src/views/list/modules/CreateForm.vue index d060f84d6d..657eb754df 100644 --- a/src/views/list/modules/CreateForm.vue +++ b/src/views/list/modules/CreateForm.vue @@ -1,5 +1,5 @@ From 045e254b8116a4f7e599e7dc2d0ce91ad4b11f92 Mon Sep 17 00:00:00 2001 From: jslyzx <821203886@qq.com> Date: Thu, 22 Aug 2019 19:33:21 +0800 Subject: [PATCH 036/667] =?UTF-8?q?=E5=9F=BA=E7=BA=BF=E7=BB=88=E7=A8=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/account/center/Index.vue | 131 +++++++++++++++++++++-------- 1 file changed, 98 insertions(+), 33 deletions(-) diff --git a/src/views/account/center/Index.vue b/src/views/account/center/Index.vue index bb361413e3..5fd4d78f9a 100644 --- a/src/views/account/center/Index.vue +++ b/src/views/account/center/Index.vue @@ -30,7 +30,7 @@ - + 是 否 @@ -38,12 +38,12 @@ 有 无 - - + + {{op.questionName}} - + {{op.questionName}}
@@ -53,28 +53,28 @@ - - - + + + 是 否 - - 有fdf - 无fdf + + 有 + 无
{{sub.childEleName}} {{subOp.questionName}} - + {{subOp.questionName}} {{thirdSub.childList[0].questionName}} - + @@ -88,15 +88,18 @@ {{subOp.questionName}} - + 是 否 - + 有 无 - + + + + {{secondSub.questionName}} @@ -110,11 +113,11 @@ {{thirdSub.questionName}} - + 是 否 - + @@ -133,7 +136,7 @@ diff --git a/src/views/gallery/modules/RegisterForm.vue b/src/views/gallery/modules/RegisterForm.vue index 70845f7775..41383b9308 100644 --- a/src/views/gallery/modules/RegisterForm.vue +++ b/src/views/gallery/modules/RegisterForm.vue @@ -14,13 +14,13 @@
- +
- + {{ item.label }} @@ -38,6 +38,7 @@ + diff --git a/src/views/group/index.vue b/src/views/group/index.vue index e69de29bb2..5c5d78b558 100644 --- a/src/views/group/index.vue +++ b/src/views/group/index.vue @@ -0,0 +1,337 @@ + + + + diff --git a/src/views/group/modules/Drawer.vue b/src/views/group/modules/Drawer.vue new file mode 100644 index 0000000000..2987121a87 --- /dev/null +++ b/src/views/group/modules/Drawer.vue @@ -0,0 +1,106 @@ + + + diff --git a/src/views/list/TableList.vue b/src/views/list/TableList.vue index 42b0f66f08..efefcb2b3b 100644 --- a/src/views/list/TableList.vue +++ b/src/views/list/TableList.vue @@ -3,52 +3,52 @@
- - + + - 查询 + 查询 - {{ advanced ? '收起' : '展开' }} + {{ advanced ? '更多筛选' : '更多筛选' }} 新建 - - - - - 全部 - 关闭 - 运行中 - - - - - - - 全部 - 关闭 - 运行中 - - - - - 全部 - 关闭 - 运行中 - - - + +
+ + +
+

本月新增病例

+

本年新增病例

+

全部病例

+
+ + + + + + + + + + - + + + + + + +
- -

{{text}}

+ +

{{ text }}

 {{ index + 1 }} @@ -69,18 +69,14 @@ - + @@ -90,7 +86,7 @@ import { STable, Ellipsis } from '@/components'; import StepByStepModal from './modules/StepByStepModal'; import CreateForm from './modules/CreateForm'; import { getPatientList } from '@/api/patient'; -import UserDetail from './modules/UserDetail' +import UserDetail from './modules/UserDetail'; const visitMap = { 0: { @@ -166,7 +162,6 @@ export default { ], // 加载数据方法 必须为 Promise 对象 loadData: parameter => { - console.log('loadData.parameter', parameter); return getPatientList(Object.assign(parameter, this.queryParam)).then(res => { return res; }); @@ -204,11 +199,9 @@ export default { return visitMap[type].status; } }, - created() { - - }, + created() {}, methods: { - showUser(record){ + showUser(record) { this.$refs.detailModal.show(record); }, handleEdit(record) { @@ -235,6 +228,14 @@ export default { this.queryParam = { date: moment(new Date()) }; + }, + changeTime1(time) { + console.log(time); + this.queryParam.date1 = moment(time).format('YYYY-MM-DD'); + }, + changeTime2(time) { + console.log(time); + this.queryParam.date2 = moment(time).format('YYYY-MM-DD'); } } }; @@ -267,19 +268,31 @@ export default { } .tableSearch { - background: #FFFFFF; + background: #ffffff; position: absolute; top: 52px; z-index: 100; + /deep/ .ant-card-body .ant-form-horizontal .ant-form-item > .ant-form-item-label { + width: 70px !important; + } + .commonRetrieval { + p { + &:hover { + cursor: pointer; + text-decoration: underline; + } + } + } } -.userName{ - color: #1FB2FA; +.userName { + color: #1fb2fa; margin: 0; -} -.userName:active,.userName:hover{ + &:active, + &:hover { text-decoration: underline; text-underline-position: under; - text-decoration-color: #1FB2FA; + text-decoration-color: #1fb2fa; cursor: pointer; + } } diff --git a/src/views/list/modules/CreateForm.vue b/src/views/list/modules/CreateForm.vue index 0afb3cf14b..a584cc4912 100644 --- a/src/views/list/modules/CreateForm.vue +++ b/src/views/list/modules/CreateForm.vue @@ -1,4 +1,4 @@ -