20250225

src/layouts/BasicLayout.less

@@ -3,6 +3,7 @@
 		background-color: #f6f6f6;
 		width: 100vw;
 		height: 100vh;
+		
 		.ant-layout-sider{
 			flex: 0 0 120px !important;
 			max-width: 120px !important;
@@ -81,6 +82,11 @@
 			}
 
 		}
+		
+		.ant-layout{
+			height: 100vh;
+			display: flex;
+			flex-direction: column;
 			.ant-layout-header{
 				padding: 0 !important;
 				height: 5vw !important;
@@ -151,10 +157,11 @@
 			}
 			.ant-layout-content{
 				position: relative;
-			
+				flex: 1;
+				overflow: hidden;
 				.global-layout-content{
-				height: calc(100vh - 56px);
+					height: 100%;
-				overflow-y: hidden;
+					overflow-y: auto;
 					padding: 10px;
 					position: relative;
 				}
@@ -241,5 +248,8 @@
 					
 				}
 			}
+				
+		}
+		
 	}
 }

src/views/document/index.vue

@@ -13,8 +13,8 @@
 				</div>
 			</div>
 			<div class="doc-list-table">
-				<a-table :columns="columns" :data-source="dataSource" :scroll="{ y: 700, x: 800 }"
+				<a-table :columns="columns" :data-source="dataSource" bordered :scroll="{ y: 780, x: 1500 }"
-					:locale="{ emptyText: '暂无数据'}" rowKey="firstAidId" size="middle" :pagination="pagination">
+					:locale="{ emptyText: '暂无数据'}" rowKey="firstAidId" size="small"  :pagination="pagination">
 					<template slot="action" slot-scope="text, row">
 						<a-button type="link" @click="editReport(row, 'patientDetail')">详情</a-button>
 						<a-button type="link" @click="checkReport(row, 'docReport')">报告单</a-button>
@@ -92,17 +92,19 @@
 				},
 				columns: [{
 						title: '姓名',
-						width: 120,
+						width: 150,
 						dataIndex: 'patientName',
+						ellipsis: true,
+						align: 'center',
 						key: 'name',
 						fixed: 'left'
 					},
 					{
 						title: '性别',
-						width: 100,
+						width: 120,
 						dataIndex: 'patientGender',
 						key: 'sex',
-						fixed: 'left',
+						align: 'center',
 						scopedSlots: {
 							customRender: 'sex'
 						},
@@ -110,112 +112,135 @@
 					{
 						title: '身份证号',
 						dataIndex: 'patientIdCardNo',
-						key: '1',
+						align: 'center',
-						width: 248
+						ellipsis: true,
+						width: 280
 					},
 					{
 						title: '联系方式',
 						dataIndex: 'patientPhone',
 						key: '2',
-						width: 150
+						ellipsis: true,
+						align: 'center',
+						width: 250
 					},
 					{
 						title: '负责医生',
 						dataIndex: 'doctorName',
 						key: '3',
-						width: 150
+						ellipsis: true,
+						align: 'center',
+						width: 250
 					},
 					{
 						title: '绿色通道',
 						dataIndex: 'address',
 						key: '4',
-						width: 150
+						ellipsis: true,
+						align: 'center',
+						width: 250
 					},
 					{
 						title: '发病时间',
-						dataIndex: 'address',
+						dataIndex: 'JBXX-FBSJ',
 						key: '5',
-						width: 150
+						ellipsis: true,
+						align: 'center',
+						width: 280
 					},
 					{
 						title: '到院时间',
-						dataIndex: 'address',
+						dataIndex: 'JBXX-DYSJ',
 						key: '6',
-						width: 150
+						ellipsis: true,
+						align: 'center',
+						width: 280
 					},
 					{
 						title: '开启绿道时间',
-						dataIndex: 'address',
+						dataIndex: 'RYPG-GR-TIME',
 						key: '7',
-						width: 180
+						ellipsis: true,
+						align: 'center',
+						width: 280
 					},
 					{
 						title: '卒中医生到场时间',
-						dataIndex: 'address',
+						dataIndex: 'JBXX-SNYSDC-TIME',
 						key: '8',
 						align: 'center',
-						width: 180
+						ellipsis: true,
+						width: 280
 					},
 					{
 						title: '采血时间',
-						dataIndex: 'address',
+						dataIndex: 'RYPG-BLOOD-TIME',
 						key: '9',
 						align: 'center',
-						width: 150
+						ellipsis: true,
+						width: 280
 					},
 					{
 						title: '心电时间',
-						dataIndex: 'address',
+						dataIndex: 'RYPG-ECG-TIME',
 						key: '10',
 						align: 'center',
-						width: 150
+						ellipsis: true,
+						width: 280
 					},
 					{
 						title: 'CT时间',
-						dataIndex: 'address',
+						dataIndex: 'RYPG-CT-JCKS-TIME',
 						key: '11',
 						align: 'center',
-						width: 150
+						ellipsis: true,
+						width: 280
 					},
 					{
 						title: '团注时间',
-						dataIndex: 'address',
+						dataIndex: 'JMRS-TZSJ',
 						key: '12',
 						align: 'center',
-						width: 150
+						ellipsis: true,
+						width: 280
 					},
 					{
 						title: '指标分析(单位/秒)',
-						dataIndex: 'address',
+						dataIndex: 'JMRS-ZBFX',
 						key: '13',
 						align: 'center',
-						width: 180
+						ellipsis: true,
+						width: 280
 					},
 					{
 						title: '介入治疗记录',
-						dataIndex: 'address',
+						dataIndex: 'JMRS-JRJL',
 						key: '14',
 						align: 'center',
-						width: 150
+						ellipsis: true,
+						width: 280
 					},
 					{
 						title: '创建时间',
-						dataIndex: 'address',
+						dataIndex: 'createTime',
 						key: '15',
 						align: 'center',
-						width: 150
+						ellipsis: true,
+						width: 280
 					},
 					{
 						title: '状态',
-						dataIndex: 'address',
+						dataIndex: 'finishStatus',
-						width: 100,
+						width: 200,
 						align: 'center',
+						ellipsis: true,
 						key: '16'
 					},
 					{
 						title: '备注',
 						dataIndex: 'remark',
-						width: 500,
+						width: 380,
+						ellipsis: true,
 						key: '17'
 					},
 					{
@@ -284,7 +309,14 @@
 				if (code === 200) {
 					// this.isLoading = false;
 					this.pagination.total = data.total;
-					this.dataSource = data?.list || [];
+					this.dataSource = (data?.list || []).map(a => {
+						if(a.firstAidRecordVos){
+							a.firstAidRecordVos.forEach(({answer, questionCode}) => {
+								a[questionCode] = answer.toString()
+							})
+						}
+						return a;
+					});
 				} else {
 					this.$message.error(msg);
 				}

src/views/statistics/index.vue

@@ -1315,8 +1315,8 @@
 
 <style lang="less" scoped>
 	.statistics {
-		height: 100%;
+		// height: 100%;
-		overflow-y: auto;
+		// overflow-y: auto;
 
 		// padding: 10px;
 		.statistics-container {