diff --git a/src/App.vue b/src/App.vue index ba6cd40..ae17ed0 100644 --- a/src/App.vue +++ b/src/App.vue @@ -286,7 +286,7 @@ background: #f6f8fa; height: 100%; position: relative; - + user-select: none; ::-webkit-scrollbar { display: none; } diff --git a/src/api/index.js b/src/api/index.js index 2d2433b..b35be27 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -372,4 +372,4 @@ export const exportAll = (params) => export const exportJrPdf = (params) => axios.post(`${proxyUrl1}/admin/export/exportJrPdf`, { ...params - }); \ No newline at end of file + }); diff --git a/src/assets/less/common.css b/src/assets/less/common.css index a913178..1fbb09d 100644 --- a/src/assets/less/common.css +++ b/src/assets/less/common.css @@ -226,7 +226,7 @@ } .ant-form .ant-form-item:not(:last-child) { - border-bottom: 1px solid #dfe6ec; + /* border-bottom: 1px solid #dfe6ec; */ padding-bottom: 18px; } @@ -312,4 +312,9 @@ .ant-tabs-nav-container .ant-tabs-ink-bar { background: #7690e5 !important; +} +.ant-form .ant-form-item-label label{ + font-size: 18px; + color: #222; + } \ No newline at end of file diff --git a/src/assets/less/common.less b/src/assets/less/common.less index 29bd672..5277da3 100644 --- a/src/assets/less/common.less +++ b/src/assets/less/common.less @@ -351,6 +351,11 @@ } } +.ant-form .ant-form-item-label label{ + font-size: 18px; + color: #222; + +} .ant-form { .ant-form-item-label{ text-align: left; @@ -362,7 +367,7 @@ } .ant-form-item{ &:not(:last-child) { - border-bottom: 1px solid #dfe6ec; + // border-bottom: 1px solid #dfe6ec; } box-sizing: border-box; } @@ -456,26 +461,28 @@ } } - .container-left-header { - display: flex; - margin-top: 20px; - margin-bottom: 20px; - span { - width: 12px; - height: 32px; - display: inline-block; - border-radius: 12px; - background: #8FB3FB; - margin-right: 16px; - } +// .container-left-header { +// // display: flex; +// margin-top: 20px; +// margin-bottom: 20px; +// // width: 100%; +// // float: left; +// span { +// width: 8px; +// height: 25px; +// display: inline-block; +// border-radius: 12px; +// background: #8FB3FB; +// margin-right: 16px; +// } - p { - line-height: 32px; - font-size: 32px; - font-weight: 600; - margin: 0; - } - } +// p { +// line-height: 32px; +// font-size: 1.2rem; +// font-weight: 600; +// margin: 0; +// } +// } //急诊溶栓记录 .basic-btn { @@ -579,17 +586,19 @@ .container-left-header { display: flex; span { - width: 12px; - height: 32px; + width: 8px; + height: 28px; display: inline-block; border-radius: 12px; background: #8FB3FB; margin-right: 16px; + position: relative; + top: 3px; } p { line-height: 32px; - font-size: 32px; + font-size: 1.2rem; font-weight: 600; margin: 0; } @@ -597,8 +606,8 @@ .basicr-back { border-radius: 12px; background: #fff; - padding: 0 28px; - box-shadow: 0 2px 12px 0 rgba(52, 52, 52, .1); + padding: 0 12px; + // box-shadow: 0 2px 12px 0 rgba(52, 52, 52, .1); } .container { flex: 1; @@ -627,48 +636,65 @@ font-size: 16px; } } + .ant-checkbox-group .ant-checkbox-wrapper{ + font-size: 18px; + } + .ant-radio-wrapper{ + font-size: 18px; + } + .detail-form { .detail-form-control{ display: flex; align-items: center; } + .ant-form-item-control{ + width: 100%; + } .ant-form-item { display: flex; - justify-content: space-between; - align-items: center; + // justify-content: space-between; + align-items: left; padding: 12px 0 !important; margin-bottom: 0 !important; .ant-form-item-label { display: flex; - align-items: center; - - label { - font-size: 24px !important; - } + width: 160px !important; } .ant-radio-wrapper { - height: 30px !important; - font-size: 20px !important; + // height: 30px !important; + font-size: 14px !important; } } + .ant-input{ + width: 100%; + background: #f2f3f5; + border: 1px solid #f2f3f5; + } .ant-select{ - min-width: 300px; - display: flex; - justify-content: flex-end; + // width: 195px; + width: 100%; + } + .ant-radio-group span{ + padding: 0; + } + .ant-select-selection--single{ + background: #f2f3f5; + border: 1px solid #f2f3f5; } .ant-select-selection-selected-value{ padding-right: 10px; } .ant-select-selection__rendered{ - line-height: 40px; + line-height: 32px; max-width: 300px; } .ant-form-item-control-wrapper { display: flex; align-items: center; - justify-content: flex-end; + // justify-content: flex-end; text-align: right; } @@ -678,6 +704,11 @@ display: flex; flex-direction: column; margin-bottom: 20px; + width: 100%; + } + .adverse{ + width: 100%; + float: left; } // 复选框 .ant-checkbox-group{ @@ -710,13 +741,13 @@ align-items: center; } .operate { - font-size: 24px; + font-size: 1rem; color: #000000; padding-right: 12px; } .label-info{ color: #000000; - font-size: 20px; + font-size: 1rem; } } } @@ -825,5 +856,25 @@ } } } - - + .thrombolysis-box{ + .ant-steps-dot .ant-steps-item-content, + .ant-steps-dot.ant-steps-small .ant-steps-item-content{ + width: 100px; + } + + .ant-steps.ant-steps-horizontal { + .ant-steps-item-container .ant-steps-item-title{ + font-size: 20px; + } + .ant-steps-item-finish, + .ant-steps-item-process{ + .ant-steps-item-container .ant-steps-item-title{ + font-size: 20px; + color: #3D3D3D; + } + } + } + + + } + diff --git a/src/config/code.js b/src/config/code.js index d2a96b7..5e6cd8f 100644 --- a/src/config/code.js +++ b/src/config/code.js @@ -1279,6 +1279,19 @@ export const XGZL_CODE = { inputType: 'number', default: '', }, + + 'XGZL-CCWC-TIME': { + text: '穿刺完成时间', + type: 'datetime', + default: '', + valueType: 'string', + }, + 'XGZL-SH-SCXGZTSJ': { + text: '首次血管再通时间', + type: 'datetime', + default: '', + valueType: 'string', + }, 'XGZL-SQ-TICI': { text: 'TICI分级', type: 'radio', @@ -1291,12 +1304,6 @@ export const XGZL_CODE = { }, default: '', }, - 'XGZL-CCWC-TIME': { - text: '穿刺完成时间', - type: 'datetime', - default: '', - valueType: 'string', - }, 'XGZL-XGKT': { text: '血管内开通方法', type: 'checkbox', @@ -1312,12 +1319,7 @@ export const XGZL_CODE = { '机械碎栓', ], }, - 'XGZL-SH-SCXGZTSJ': { - text: '首次血管再通时间', - type: 'datetime', - default: '', - valueType: 'string', - }, + 'XGZL-BFZ': { text: '手术并发症', type: 'checkbox', @@ -1326,13 +1328,13 @@ export const XGZL_CODE = { '无', '内出血', '动脉夹层', - '缺血性并发症/其他部位动脉闭塞', '支架脱离', '再闭塞', '消化道出血', '颈动脉海绵窦痿', '再灌注损伤', '其他', + '缺血性并发症/其他部位动脉闭塞', ], }, 'XGZL-BFZ-ELSE': { diff --git a/src/layouts/BasicLayout.less b/src/layouts/BasicLayout.less index daa8cbb..c11d8b8 100644 --- a/src/layouts/BasicLayout.less +++ b/src/layouts/BasicLayout.less @@ -12,26 +12,28 @@ background-color: #fff; .layout-sider-header-row{ display: flex; - padding: .3rem 1rem; - height: 5vw; - line-height: 5vw; + // padding: .3rem 1rem; + height: 59px; + line-height: 59px; box-sizing: border-box; overflow: hidden; justify-content: center; + border-bottom: 1px solid #eee; + .layout-sider-header-row-icon{ display: flex; align-items: center; .sider-header-icon{ display: inline-block; text-align: center; - width: 2.8rem; - height: 2.8rem; - line-height: 2.8rem; + width: 50px; + height: 50px; + line-height: 50px; background-color: #659aff; border-radius: 50px; overflow: hidden; color: #FFFFFF; - font-size: 1.8rem; + font-size: 28px; } } @@ -44,6 +46,7 @@ } .layout-sider-menu{ padding: 10px; + padding-top: 20px; user-select: none; /* 禁止文本选择 */ -webkit-user-select: none; /* Safari */ -moz-user-select: none; /* Firefox */ @@ -51,7 +54,7 @@ .menus{ .menu-item{ border-radius: .5rem; - color: #8a8c8e; + color: #666666; overflow: hidden; display: flex; justify-content: flex-start; @@ -60,13 +63,15 @@ margin-bottom: .5rem; cursor: pointer; &.active{ - color: #0576fe; + color: #FFFFFF; box-shadow: 0 1px 6px rgba(238, 238, 238, 1); + background-color: #0576fe; + } .menu-item-icon{ img{ - width: 1.6rem; - height: 1.6rem; + width: 25px; + height: 25px; } } .menu-item-name{ @@ -74,6 +79,7 @@ text-align: left; margin-left: .5rem; text-align: center; + font-size: 22px; } } @@ -89,9 +95,11 @@ flex-direction: column; .ant-layout-header{ padding: 0 !important; - height: 5vw !important; - line-height: 5vw !important; + height: 59px !important; + line-height: 59px !important; background-color: #FFFFFF !important; + border-bottom: 1px solid #eee; + box-sizing: border-box; .patient-box{ display: flex; justify-content: flex-start; @@ -102,7 +110,7 @@ display: flex; flex-direction: column; align-items: center; - font-size: 1.5rem; + font-size: 22px; font-weight: bold; margin-right: 1rem; } @@ -110,7 +118,7 @@ height: 100%; display: flex; align-items: center; - font-size: 1.5rem; + font-size: 18px; .lable { // color: #AAAAAA; @@ -129,7 +137,7 @@ } .patient-action{ display: flex; - font-size: 1.5rem; + font-size: 22px; padding: 0 .2rem; align-items: center; margin-left: 1rem; @@ -147,10 +155,10 @@ .layout-sider-header-row-title{ background-color: #fff; - height: 5vw; - line-height: 5vw; + height: 59px; + line-height: 59px; flex: 1; - font-size: 0.75rem; + font-size: 22px; margin-left: 0rem; padding-left: 20px; } @@ -196,7 +204,7 @@ text-align: left; flex: 1; margin-left: 1rem; - font-size: 1.4rem; + font-size: 20px; color: #FFFFFF; font-weight: bold; .user-name{ @@ -215,7 +223,7 @@ box-shadow: 5px 5px 6px rgba(238, 238, 238, 1); border-radius: .6rem; line-height: 2rem; - font-size: .8rem; + font-size: 16px; .label{ color: #8a8c8e; } @@ -224,7 +232,7 @@ .person-content{ margin-top: 3.5rem; padding: 1.2rem 1rem; - font-size: .8rem; + font-size: 16px; flex: 1; .person-content-row{ border-bottom: 2px solid #eee; @@ -237,6 +245,7 @@ } } .person-footer{ + margin-top: 200px; padding: 1rem; .person-footer-button { diff --git a/src/layouts/BasicLayout.vue b/src/layouts/BasicLayout.vue index 8eadbb1..4e51408 100644 --- a/src/layouts/BasicLayout.vue +++ b/src/layouts/BasicLayout.vue @@ -76,7 +76,7 @@ --> -
@@ -137,6 +137,7 @@ loginInfo, messageQuery, saveAidRecord, + updateFirstAid } from 'api'; import icon01 from '@/assets/images/slice/icon01.png' import icon01H from '@/assets/images/slice/icon01H.png' @@ -213,6 +214,7 @@ }, methods: { ...mapMutations('patient', ['setPatientData', 'setTimerData', 'setPatientDataCur']), + ...mapMutations('storm', ['setToken']), handleClickMenu(item, index) { if (index != this.current) { this.current_ = this.current @@ -258,12 +260,14 @@ this.setPatientDataCur({}); if (this.$route.name != 'PatientList') this.$router.replace('/firstaid/patientList') } - + + this.current = 0 + this.current_ = 0 }, async handleTermin(finishStatus) { const { firstAidId } = this.patientData; - let res = await saveAidRecord({ + let res = await updateFirstAid({ firstAidId, finishStatus }); @@ -308,18 +312,25 @@ content: '退出登录后回终止本次急救, 确认要退出登录吗?', onOk: async () => { const { firstAidId } = this.patientData; - let res = await saveAidRecord({ - firstAidId, - finishStatus: 1 - }); - const { code, data, msg } = res; - if (code === 200) { - this.setPatientData({}) - this.setTimerData({}); - this.$router.replace('/login') - } else { - this.$message.error(msg); + if(firstAidId){ + let res = await updateFirstAid({ + firstAidId, + finishStatus: 1 + }); + const { code, data, msg } = res; + if (code === 200) { + this.setPatientData({}) + this.setTimerData({}); + this.setToken(undefined) + this.$router.replace('/login') + } else { + this.$message.error(msg); + } + }else{ + this.setToken(undefined) + this.$router.replace('/login') } + }, onCancel() {}, }); diff --git a/src/views/Patient/FirstInfo.vue b/src/views/Patient/FirstInfo.vue index a05f79a..2cdd973 100644 --- a/src/views/Patient/FirstInfo.vue +++ b/src/views/Patient/FirstInfo.vue @@ -799,6 +799,7 @@ p { diff --git a/src/views/Patient/index.vue b/src/views/Patient/index.vue index eeab093..864215d 100644 --- a/src/views/Patient/index.vue +++ b/src/views/Patient/index.vue @@ -411,9 +411,9 @@ margin-bottom: .2rem; .operater-title { - font-size: 1rem; + font-size: 20px; font-weight: bold; - line-height: 1.6rem; + line-height: 32px; } } diff --git a/src/views/before/Informed.vue b/src/views/before/Informed.vue index 2054dd2..07a7c42 100644 --- a/src/views/before/Informed.vue +++ b/src/views/before/Informed.vue @@ -481,7 +481,7 @@ export default { height: 500px; } .info { - font-size: 28px; + font-size: 18px; font-family: Source Han Sans CN, Source Han Sans CN-Bold; font-weight: 700; text-align: left; diff --git a/src/views/before/UploadCT.vue b/src/views/before/UploadCT.vue index 1f7e940..cde7146 100644 --- a/src/views/before/UploadCT.vue +++ b/src/views/before/UploadCT.vue @@ -196,7 +196,7 @@ flex: 1; .info { - font-size: 28px; + font-size: 18px; font-family: Source Han Sans CN, Source Han Sans CN-Bold; font-weight: 700; text-align: left; diff --git a/src/views/before/UploadInformed.vue b/src/views/before/UploadInformed.vue index d8dc04c..0d6817c 100644 --- a/src/views/before/UploadInformed.vue +++ b/src/views/before/UploadInformed.vue @@ -206,7 +206,7 @@ export default { flex: 1; .info { - font-size: 28px; + font-size: 18px; font-family: Source Han Sans CN, Source Han Sans CN-Bold; font-weight: 700; text-align: left; diff --git a/src/views/before/Video.vue b/src/views/before/Video.vue index 3619377..1cdf1e5 100644 --- a/src/views/before/Video.vue +++ b/src/views/before/Video.vue @@ -77,7 +77,9 @@ export default { \ No newline at end of file diff --git a/src/views/thrombolysis/components/throm-before3.vue b/src/views/thrombolysis/components/throm-before3.vue index 31abf7c..f994041 100644 --- a/src/views/thrombolysis/components/throm-before3.vue +++ b/src/views/thrombolysis/components/throm-before3.vue @@ -278,7 +278,7 @@ color: #ffffff; text-align: center; line-height: 40vh; - font-size: 2rem; + // font-size: 2rem; } .emtpy { diff --git a/src/views/thrombolysis/components/throm-before4.vue b/src/views/thrombolysis/components/throm-before4.vue index 3056b54..16efa6d 100644 --- a/src/views/thrombolysis/components/throm-before4.vue +++ b/src/views/thrombolysis/components/throm-before4.vue @@ -573,7 +573,7 @@ .video-container { .info { - font-size: 2rem; + font-size: 18px; margin-bottom: 2rem; } } @@ -587,7 +587,7 @@ color: #ffffff; text-align: center; line-height: 50vh; - font-size: 2rem; + // font-size: 2rem; } .emtpy { @@ -612,7 +612,7 @@ flex: 1; .info { - font-size: 28px; + font-size: 18px; font-family: Source Han Sans CN, Source Han Sans CN-Bold; font-weight: 700; text-align: left; diff --git a/src/views/thrombolysis/components/throm-ing-date.vue b/src/views/thrombolysis/components/throm-ing-date.vue index e0b8b7f..58dd72c 100644 --- a/src/views/thrombolysis/components/throm-ing-date.vue +++ b/src/views/thrombolysis/components/throm-ing-date.vue @@ -599,6 +599,7 @@ p { \ No newline at end of file diff --git a/src/views/thrombolysis/components/throm-result-baseInfo.vue b/src/views/thrombolysis/components/throm-result-baseInfo.vue index 39af91a..141b4ba 100644 --- a/src/views/thrombolysis/components/throm-result-baseInfo.vue +++ b/src/views/thrombolysis/components/throm-result-baseInfo.vue @@ -3,86 +3,91 @@
- - -
- - - -
- - -
- -
- - -
- - 男 - 女 - -
- - -
- - - {{item}} - - -
- - -
- -
- - -
- - - - {{item}} - - - - - - - - - - - {{item}} - - -
- + + + +
+ + + +
+ + +
+ +
+ + +
+ + 男 + 女 + +
+ + +
+ + + {{item}} + + +
+ + +
+ +
+ + + +
+ + + + {{item}} + + + + + + + + + + + {{item}} + + +
+ + + + +
- {{k}} @@ -402,6 +407,29 @@ margin-top: 20px; padding: 0 10%; } + .basicr-back,.diagnosis{ + width:100%; + float:left; + } + .basicr-back .ant-form-item:nth-child(odd){ + width:48%; + float:left; + } + .basicr-back .ant-form-item:nth-child(even){ + width:49%; + float:left; + } + .basicr-back .ant-form-item:nth-child(odd) { + border-right: 1px solid #ddd; + border-radius: 0; + padding-right:2% !important; + margin-right:2% !important; + } + .detail-form .ant-form-item .ant-form-item-label{ + width: 170px; + } + + \ No newline at end of file diff --git a/src/views/thrombolysis/components/throm-result-firstInfo.vue b/src/views/thrombolysis/components/throm-result-firstInfo.vue index 9f1d308..f03fd0a 100644 --- a/src/views/thrombolysis/components/throm-result-firstInfo.vue +++ b/src/views/thrombolysis/components/throm-result-firstInfo.vue @@ -45,8 +45,9 @@
- +
+ @@ -172,9 +173,10 @@
- +
- + +
@@ -189,7 +191,7 @@ - @@ -631,9 +633,42 @@ .adverse { padding: 15px 0; } + .basicr-back .ant-form-item{ + width:48%; + float:left; + height:60px; + } + .basicr-back .ant-form-item:nth-child(odd) { + border-right: 1px solid #ddd; + border-radius: 0; + padding-right:2% !important; + margin-right:2% !important; + } + .treatmentItem .ant-form-item:nth-child(9),.treatmentItem .ant-form-item:nth-child(10),.treatmentItem .ant-form-item:nth-child(11){ + width:100%; + float:left; + border:none; + } + .treatmentItem .ant-form-item:nth-child(10),.treatmentItem .ant-form-item:nth-child(11){ + height:150px !important; + } + .basicr-back .ant-form-item .ant-form-item-label{ + // width: 100px !important; + } + .treatmentItem .ant-form-item:nth-child(9).ant-form-item .ant-form-item-label{ + // width: 100px !important; + flex: none; + margin-right: 20px; + } + .radioGroupItem:nth-of-type(2){ + position: relative; + left: -180px; + } + \ No newline at end of file