From a7b73ebd70f8dd28cb7fbbe31494e2e33356d2e2 Mon Sep 17 00:00:00 2001
From: liwei <1078559858@qq.com>
Date: Sat, 30 Oct 2021 16:52:02 +0800
Subject: [PATCH 06/18] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B7=AF=E7=94=B1?=
=?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/router/routers.js | 99 ++-----------------------------------------
1 file changed, 4 insertions(+), 95 deletions(-)
diff --git a/src/router/routers.js b/src/router/routers.js
index 5ad167c86..afcc51c3b 100644
--- a/src/router/routers.js
+++ b/src/router/routers.js
@@ -20,7 +20,7 @@ const debug = process.env.NODE_ENV === 'production'
* }
*/
-export default [
+export default [...hRouter].concat([
{
path: '/login',
name: 'login',
@@ -53,99 +53,6 @@ export default [
}
]
},
- // {
- // path: '',
- // name: 'setting',
- // component: Main,
- // meta: {
- // title: '设置',
- // icon: 'ios-book'
- // },
- // children: [
- // {
- // path: 'demo_page',
- // name: 'resetPwd',
- // meta: {
- // icon: '_qq',
- // title: '重置密码'
- // },
- // component: () => import('@/view/demo-page.vue')
- // },
- // {
- // path: 'set_limit',
- // name: 'setQX',
- // meta: {
- // icon: '_qq',
- // title: '重置密码2'
- // },
- // component: () => import('@/view/demo-page.vue')
- // }
- // // {
- // // path: 'join_page',
- // // name: 'setQX',
- // // meta: {
- // // icon: '_qq',
- // // title: '权限设置'
- // // },
- // // component: () => import('@/view/join-page.vue')
- // // },
- // // {
- // // path: 'join_page',
- // // name: 'setQX',
- // // meta: {
- // // icon: '_qq',
- // // title: '病例模板设置'
- // // },
- // // component: () => import('@/view/join-page.vue')
- // // },
- // // {
- // // path: 'join_page',
- // // name: 'setQX',
- // // meta: {
- // // icon: '_qq',
- // // title: '表格模板设置'
- // // },
- // // component: () => import('@/view/join-page.vue')
- // // }
- // ]
- // },
- // {
- // path: '',
- // name: 'search',
- // meta: {
- // title: '查询',
- // icon: 'ios-book'
- // },
- // children:[
- // {
- // path: 'join_page',
- // name: 'searchBR',
- // meta: {
- // icon: '_qq',
- // title: '病人查询'
- // },
- // component: () => import('@/view/join-page.vue')
- // },
- // {
- // path: 'join_page',
- // name: 'setQX1',
- // meta: {
- // icon: '_qq',
- // title: '个人用户查询'
- // },
- // component: () => import('@/view/join-page.vue')
- // },
- // {
- // path: 'join_page',
- // name: 'setQX2',
- // meta: {
- // icon: '_qq',
- // title: '医院医生查询'
- // },
- // component: () => import('@/view/join-page.vue')
- // }
- // ]
- // },
{
path: '',
name: 'doc',
@@ -401,6 +308,7 @@ export default [
path: '/i18n',
name: 'i18n',
meta: {
+ hideInMenu: debug,
hideInBread: true
},
component: Main,
@@ -420,6 +328,7 @@ export default [
path: '/error_store',
name: 'error_store',
meta: {
+ hideInMenu: debug,
hideInBread: true
},
component: Main,
@@ -591,4 +500,4 @@ export default [
},
component: () => import('@/view/error-page/404.vue')
}
-].concat([...hRouter])
+])
From a1cc03ec6bd29d4f08559bb967b7f4af53e3dfde Mon Sep 17 00:00:00 2001
From: liwei <1078559858@qq.com>
Date: Sat, 30 Oct 2021 17:30:00 +0800
Subject: [PATCH 07/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/view/error-page/back-btn-group.vue | 2 +-
vue.config.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/view/error-page/back-btn-group.vue b/src/view/error-page/back-btn-group.vue
index 4bbda48c5..798c5659d 100644
--- a/src/view/error-page/back-btn-group.vue
+++ b/src/view/error-page/back-btn-group.vue
@@ -11,7 +11,7 @@ export default {
name: 'backBtnGroup',
data () {
return {
- second: 5,
+ second: 5000,
timer: null
}
},
diff --git a/vue.config.js b/vue.config.js
index 902148d37..f775fc689 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -24,7 +24,7 @@ module.exports = {
// sub-path here. For example, if your app is deployed at
// https://www.foobar.com/my-app/
// then change this to '/my-app/'
- publicPath: BASE_URL,
+ baseUrl: BASE_URL,
// tweak internal webpack configuration.
// see https://github.com/vuejs/vue-cli/blob/dev/docs/webpack.md
// 如果你不需要使用eslint,把lintOnSave设为false即可
From 5ee93ba7d2acdd05318849d4bcb30a1f263c363b Mon Sep 17 00:00:00 2001
From: liwei <1078559858@qq.com>
Date: Sat, 30 Oct 2021 20:01:46 +0800
Subject: [PATCH 08/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=AF=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/router/hRouter.js | 10 +++++-----
src/router/index.js | 3 ++-
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/router/hRouter.js b/src/router/hRouter.js
index 04a4c7e37..a32b3438b 100644
--- a/src/router/hRouter.js
+++ b/src/router/hRouter.js
@@ -4,7 +4,7 @@ import Main from '@/components/main'
// 设置
const setting = [
{
- path: 'zero_setting',
+ path: '/setting',
name: 'zero_setting',
component: Main,
meta: {
@@ -55,7 +55,7 @@ const setting = [
// 搜索
const search = [
{
- path: 'zero_search',
+ path: '/search',
name: 'zero_search',
component: Main,
meta: {
@@ -97,7 +97,7 @@ const search = [
// 审批
const approval = [
{
- path: 'zero_approval',
+ path: '/approval',
name: 'zero_approval',
component: Main,
meta: {
@@ -130,7 +130,7 @@ const approval = [
// 模板
const templete = [
{
- path: 'zero_template',
+ path: '/template',
name: 'zero_template',
component: Main,
meta: {
@@ -172,7 +172,7 @@ const templete = [
// 精神疾病
const spirit = [
{
- path: 'zero_spirit',
+ path: '/spirit',
name: 'zero_spirit',
component: Main,
meta: {
diff --git a/src/router/index.js b/src/router/index.js
index db0cb847d..f7b37d042 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -10,7 +10,8 @@ const { homeName } = config
Vue.use(Router)
const router = new Router({
routes,
- mode: 'history'
+ mode: 'hash',
+ base: '/hospital'
})
const LOGIN_PAGE_NAME = 'login'
From f2764c51b79261caa698590a41f03cd18c63788c Mon Sep 17 00:00:00 2001
From: liwei <1078559858@qq.com>
Date: Sat, 30 Oct 2021 20:50:54 +0800
Subject: [PATCH 09/18] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BD=8F=E9=99=A2?=
=?UTF-8?q?=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/view/zero/components/normalInfo.vue | 79 ++++++++++++++++++++
src/view/zero/spirit/inHospitalRecord.vue | 89 ++++++++++++++++++++++-
2 files changed, 166 insertions(+), 2 deletions(-)
create mode 100644 src/view/zero/components/normalInfo.vue
diff --git a/src/view/zero/components/normalInfo.vue b/src/view/zero/components/normalInfo.vue
new file mode 100644
index 000000000..9afe0116d
--- /dev/null
+++ b/src/view/zero/components/normalInfo.vue
@@ -0,0 +1,79 @@
+
+
+
+
+
+
+
diff --git a/src/view/zero/spirit/inHospitalRecord.vue b/src/view/zero/spirit/inHospitalRecord.vue
index d00d32004..931188c66 100644
--- a/src/view/zero/spirit/inHospitalRecord.vue
+++ b/src/view/zero/spirit/inHospitalRecord.vue
@@ -1,5 +1,90 @@
-
- 入院记录
+
+
+
+
+
+
+
+
+
+ 123456
+
+
+ 456789
+
+
+
+
+
+
+
+
+
+
+
From 293c3c7a7c48cb82fef1cd69cea6c34a768fee6c Mon Sep 17 00:00:00 2001
From: liwei <1078559858@qq.com>
Date: Sat, 30 Oct 2021 20:56:20 +0800
Subject: [PATCH 10/18] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/view/zero/components/normalInfo.vue | 146 +++++++++++++-----------
1 file changed, 77 insertions(+), 69 deletions(-)
diff --git a/src/view/zero/components/normalInfo.vue b/src/view/zero/components/normalInfo.vue
index 9afe0116d..0a0194341 100644
--- a/src/view/zero/components/normalInfo.vue
+++ b/src/view/zero/components/normalInfo.vue
@@ -1,79 +1,87 @@
-
+
-
-
-
From a106981b567fd3a40b60d9083238a3bee99775f1 Mon Sep 17 00:00:00 2001
From: liwei <1078559858@qq.com>
Date: Sun, 31 Oct 2021 00:25:26 +0800
Subject: [PATCH 11/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/view/zero/components/normalInfo.vue | 283 ++++++++++++++++++------
1 file changed, 217 insertions(+), 66 deletions(-)
diff --git a/src/view/zero/components/normalInfo.vue b/src/view/zero/components/normalInfo.vue
index 0a0194341..f76017bda 100644
--- a/src/view/zero/components/normalInfo.vue
+++ b/src/view/zero/components/normalInfo.vue
@@ -1,76 +1,227 @@
-
+
+
+ 基本信息
+
+
+
+ 主诉
+ 主诉
+
+
diff --git a/src/view/zero/spirit/inHospitalRecord.vue b/src/view/zero/spirit/inHospitalRecord.vue
index 931188c66..6492eeea6 100644
--- a/src/view/zero/spirit/inHospitalRecord.vue
+++ b/src/view/zero/spirit/inHospitalRecord.vue
@@ -6,7 +6,8 @@
-
+
+
@@ -25,23 +26,32 @@