diff --git a/package.json b/package.json index 7530f092..4dcfc5c1 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,7 @@ "@wangeditor/editor-for-vue": "^5.1.10", "@zxcvbn-ts/core": "^3.0.4", "animate.css": "^4.1.1", + "autofit.js": "^3.1.4", "axios": "^1.6.8", "benz-amr-recorder": "^1.1.5", "bpmn-js-token-simulation": "^0.10.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 36b39186..6e229a30 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -38,6 +38,9 @@ importers: animate.css: specifier: ^4.1.1 version: 4.1.1 + autofit.js: + specifier: ^3.1.4 + version: 3.1.4 axios: specifier: ^1.6.8 version: 1.6.8 @@ -2424,6 +2427,9 @@ packages: engines: {node: '>= 4.5.0'} hasBin: true + autofit.js@3.1.4: + resolution: {integrity: sha512-SLKn73fHeWsxJZJ5yisCYLvw0U10OLjrcOEWlPHvSRvIcvQHwuSemFtrcoTM+zccwtVWi3dwfJxT282728j9HQ==} + autoprefixer@10.4.19: resolution: {integrity: sha512-BaENR2+zBZ8xXhM4pUaKUxlVdxZ0EZhjvbopwnXmxRUfqDmwSpC2lAi/QXvx7NRdPCo1WKEcEF6mV64si1z4Ew==} engines: {node: ^10 || ^12 || >=14} @@ -4887,7 +4893,7 @@ packages: engines: {node: '>=0.10.0'} source-map@0.6.1: - resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==} + resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==, tarball: https://r2.cnpmjs.org/source-map/-/source-map-0.6.1.tgz} engines: {node: '>=0.10.0'} split-string@3.1.0: @@ -7958,6 +7964,8 @@ snapshots: atob@2.1.2: {} + autofit.js@3.1.4: {} + autoprefixer@10.4.19(postcss@8.4.38): dependencies: browserslist: 4.23.0 diff --git a/public/static/dicom/js/dicomViewPc.js b/public/static/dicom/js/dicomViewPc.js index b7a41e19..512572b1 100644 --- a/public/static/dicom/js/dicomViewPc.js +++ b/public/static/dicom/js/dicomViewPc.js @@ -248,8 +248,8 @@ function screenshotTool() { $.ajax({ type: 'POST', contentType: 'application/json', - url: 'http://127.0.0.1:48080/admin-api/ultrasoniccom/ultrasonic/ftpimage', - data: JSON.stringify({ id: window.localStorage.regid_pathology, imagebase: imageDataUrl, imgType: '3' }), + url: 'http://192.168.0.110:8095/admin-api/ultrasoniccom/ultrasonic/ftpimage', + data: JSON.stringify({ id: window.localStorage.regid_pathology, orgId: window.localStorage.orgId_pathology, imagebase: imageDataUrl, imgType: '3' }), success: function (data, textStatus, jqXHR) { alert('添加成功，请刷新报告单中的图片'); } diff --git a/src/views/Home/Index.vue b/src/views/Home/Index.vue index 76c86947..7dd03d3e 100644 --- a/src/views/Home/Index.vue +++ b/src/views/Home/Index.vue @@ -1,146 +1,196 @@ + diff --git a/src/views/applyregistration/reportPrintStatistics/index.vue b/src/views/applyregistration/reportPrintStatistics/index.vue index cbb8a4b3..2d01e482 100644 --- a/src/views/applyregistration/reportPrintStatistics/index.vue +++ b/src/views/applyregistration/reportPrintStatistics/index.vue @@ -416,6 +416,9 @@ +
@@ -453,6 +456,11 @@ v-if="item.deviceType && item.deviceType.trim().toLowerCase() == 'us'" class="page-item" /> + @@ -473,6 +481,7 @@ import { getUserProfile } from '@/api/system/user/profile' import { ElLoading } from 'element-plus' import ReportInfoCT from './ReportInfoCT.vue' import ReportInfoUS from './ReportInfoUS.vue' +import ReportInfoPathology from './ReportInfoPathology.vue' defineOptions({ name: 'ReportPrintStatistics' }) /* @@ -683,6 +692,8 @@ const handleRowClick = async (row) => { examItemNameEdit.value = row.examItemName examItemNameEditShow.value = true if (row.deviceType && row.deviceType.trim().toLowerCase() == 'us') reportInfoType.value = 'us' + else if (row.deviceType && row.deviceType.trim().toLowerCase() == 'csh1') + reportInfoType.value = 'csh1' else reportInfoType.value = 'ct' } await showQRcodeSet() diff --git a/src/views/dicomForm/dicomViewForm.vue b/src/views/dicomForm/dicomViewForm.vue index bafb94cd..a8f5a0a2 100644 --- a/src/views/dicomForm/dicomViewForm.vue +++ b/src/views/dicomForm/dicomViewForm.vue @@ -18,270 +18,284 @@ v-if="dataLoaded" frameborder="0" scrolling="no" - style="width: 100%; height: 87vh" + style="width: 100%; height: 87vh; margin-right: 14px" :src="newSrc" > - -
- -
- - - - - + +
+ +
+ + + + + - - - - - - - - - - -
- -
- - - + + + + + + + + + + + +
+ +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - -
- -
- + + + + + + + + + + + + + + 保存 - - 审核 + + + + + + + + +
+ + + + + + + + + + +
+ +
+ + 审核 + + + 保存 + +
-
+ -
@@ -323,7 +337,7 @@ const dialogVisible = ref(false) // 弹窗的是否展示 const dialogTitle = ref('') // 弹窗的标题 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用 const examineFormVO = ref({} as PatientexamlistVO) -const savedisabled = ref(true) //保存按钮是否可用 +const savedisabled = ref(false) //保存按钮是否可用 const examinedisabled = ref(false) //审核按钮是否可见 const dataLoaded = ref(false) //是否加载网页 const tagLoaded = ref(true) //是否加载影像标签 @@ -404,8 +418,6 @@ const examine = async () => { const response = await PatientexamlistApi.examine(ID.toString()) if (response) { message.alertSuccess('审核成功') - - //查询患者信息 根据ID getPatientexamlist(ID) emit('success') } @@ -694,7 +706,12 @@ const getPatientexamlist = async (id: number) => { notes.value = applyFormVO.value.notes calculateAge(applyFormVO.value.birthday) - if (applyFormVO.value.reportstatus == '已分检' || applyFormVO.value.reportstatus == '待分析') { + if ( + applyFormVO.value.reportstatus && + (applyFormVO.value.reportstatus == '已分析' || + applyFormVO.value.reportstatus == '已分检' || + applyFormVO.value.reportstatus == '待分析') + ) { savedisabled.value = false } else { savedisabled.value = true @@ -742,7 +759,7 @@ const resetForm = () => { } -