diff --git a/src/App.vue b/src/App.vue index 24e4bb8..2d62a01 100644 --- a/src/App.vue +++ b/src/App.vue @@ -23,14 +23,14 @@ -
{{ tip.content }}
-
检验结果已完成, 请前往查看
@@ -128,7 +128,7 @@ if ( n.path !== '/' && n.name !== 'PatientList' && - n.name !== 'Min'&& + n.name !== 'Min' && n.name !== '/login' ) { this.init(); @@ -176,9 +176,14 @@ tipConfirm() { this.tip.visible = false; const name = this.pushRouter[this.tip.k]; - // console.log('name: ', name); + console.log('name: ', name); this.$router.push({ - name, + name: 'Thrombolysis', + query: { + cu: 2, + ch: this.tip.k, + r: new Date().getTime() + } }); }, // 检验调取确认 @@ -226,17 +231,20 @@ }; } if (map[k] && this.taskList.status === false) { + let idx = 0; + if(map[k].startsWith('15min')) idx = 2 + else if(map[k].startsWith('30min')) idx = 3 + else if(map[k].startsWith('45min')) idx = 4 + else if(map[k].startsWith('60min')) idx = 5 // 记录不重复弹窗 if (this.taskList.text === map[k]) { this.taskList.status = true; } - if ( - this.$route.name !== 'Min' && - this.$route.name !== 'PatientList' - ) { + + if (this.$route.query?.ch != idx) { this.tip = { visible: true, - k, + k: idx, content: map[k], }; } @@ -288,43 +296,61 @@ height: 100%; position: relative; user-select: none; + ::-webkit-scrollbar { display: none; } } - // .count-container { - // width: 200px; - // background: rgba(255, 255, 255, 0.1); - // border: 1px solid #ffffff; - // box-shadow: 0px 6px 10px 0px rgba(0, 59, 172, 0.2); - // border-radius: 4px; - // overflow: hidden; - // backdrop-filter: blur(4px); - // text-align: center; - // display: flex; - // flex-direction: column; - // align-items: center; - // padding: 16px 0; - // z-index: 999; + .count-container { + width: 200px; + background: rgba(255, 255, 255, 1); + border: 1px solid #ffffff; + box-shadow: 0px 6px 10px 0px rgba(0, 59, 172, 0.2); + border-radius: 4px; + overflow: hidden; + backdrop-filter: blur(4px); + text-align: center; + display: flex; + flex-direction: column; + align-items: center; + padding: 16px 0; + z-index: 999; - // .count-name { - // font-size: 26px; - // font-family: Source Han Sans CN, Source Han Sans CN-Bold; - // font-weight: 700; - // color: #393d4e; - // line-height: 26px; - // padding-bottom: 7px; - // } + .count-name { + font-size: 26px; + font-family: Source Han Sans CN, Source Han Sans CN-Bold; + font-weight: 700; + color: #393d4e; + line-height: 26px; + padding-bottom: 7px; + } - // .van-count-down { - // font-size: 44px; - // font-family: Source Han Sans CN, Source Han Sans CN-Bold; - // font-weight: 700; - // color: #393d4e; - // line-height: 44px; - // } - // } + .van-count-down { + font-size: 44px; + font-family: Source Han Sans CN, Source Han Sans CN-Bold; + font-weight: 700; + color: #393d4e; + line-height: 44px; + } + } + .patient-form{ + text-align:center; + } + .ant-modal-content .ant-modal-footer{ + text-align:center; + border-top:none; + } + .ant-modal-content .ant-modal-header{ + background: #007AFF; + } + .patient-form .ant-modal-content .ant-modal-header{ + background: #007AFF; + padding-top: 0; + } + .ant-modal-content .ant-modal-title{ + color: #fff; + } \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index c645c8a..0aeec2e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -47,15 +47,16 @@ const routes = [{ }, component: () => import( /* 档案 */ 'views/statistics/index.vue'), }, - // { - // path: '/doc-report', - // name: 'DocReport', - // meta: { - // back: true, - // nav: true - // }, - // component: () => import( /* 档案 */ 'views/document/report.vue'), - // } + { + path: '/min', + name: 'Min', + meta: { + back: true, + nav: true + }, + component: () => import( /* min */ 'views/before/Emergency.vue'), + + } ] }, { diff --git a/src/views/Patient/components/patient-list.vue b/src/views/Patient/components/patient-list.vue index 23644d7..6f0d7f2 100644 --- a/src/views/Patient/components/patient-list.vue +++ b/src/views/Patient/components/patient-list.vue @@ -155,6 +155,7 @@ }, // 查看患者详情 checkPaitent(item, index) { + if(!item) return const { address, birthday, diff --git a/src/views/Patient/index.vue b/src/views/Patient/index.vue index cdf0949..277cc63 100644 --- a/src/views/Patient/index.vue +++ b/src/views/Patient/index.vue @@ -11,7 +11,7 @@
+ @pressEnter="onSearch" allowClear @change="handleSearchChange">
@@ -228,6 +228,10 @@ 'setVideo', 'setBook', ]), + handleSearchChange(e){ + console.log(e.data) + if(!e.data) this.onSearch() + }, //搜索 onSearch(data) { this.$refs.patientList.getData(1, this.searchVal, 'search') diff --git a/src/views/before/Emergency.vue b/src/views/before/Emergency.vue index 5f837f7..0d56787 100644 --- a/src/views/before/Emergency.vue +++ b/src/views/before/Emergency.vue @@ -8,14 +8,10 @@ - +
- - - - + + + +
- - + + {{ item }} @@ -109,19 +58,10 @@
得分
- +
-
+
{{ item.text @@ -130,47 +70,23 @@ - +
- + - +
@@ -178,321 +94,331 @@ - 保存 + 保存 + \ No newline at end of file diff --git a/src/views/thrombolysis/components/throm-ing.vue b/src/views/thrombolysis/components/throm-ing.vue index 19ca046..043db76 100644 --- a/src/views/thrombolysis/components/throm-ing.vue +++ b/src/views/thrombolysis/components/throm-ing.vue @@ -61,6 +61,7 @@ ThromIngRecord, ThromIngDate }, + props: ['tabIndex'], data() { return { currentIndex: 0, @@ -80,18 +81,18 @@ } } }, - mounted() { }, created() { - console.log('patientData', this.patientData) + if(this.tabIndex) this.currentIndex = this.tabIndex + // console.log('patientData', this.patientData) // console.log('book', this.book) }, methods: { ...mapMutations('patient', ['setTimerData']), handleClickStep(current) { - console.log(this.timerData) + // console.log(this.timerData) let code = null if (current == 1) code = 'JMRS-Q-NIHSS' else if (current == 2) code = 'JMRS-15-NIHSS' diff --git a/src/views/thrombolysis/components/throm-result-firstInfo.vue b/src/views/thrombolysis/components/throm-result-firstInfo.vue index 08f5b10..d631f0d 100644 --- a/src/views/thrombolysis/components/throm-result-firstInfo.vue +++ b/src/views/thrombolysis/components/throm-result-firstInfo.vue @@ -45,7 +45,7 @@ - +
@@ -166,19 +166,19 @@
- +
- +
- +