From fd0679dbd8104ff7629ff4cbfc7eb0405a522f9c Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Mon, 15 Jul 2024 14:50:50 +0800 Subject: [PATCH] =?UTF-8?q?=E9=98=85=E7=89=87=E6=B7=BB=E5=8A=A0=E8=B7=B3?= =?UTF-8?q?=E8=BF=87=E5=BD=93=E5=89=8D=E4=BB=BB=E5=8A=A1=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/reading.js | 16 + src/store/modules/reading.js | 7 +- .../trials-panel/reading/ad-review/index.vue | 29 +- .../reading/dicoms/components/ReportPage.vue | 45 ++- .../dicoms/customize/CustomizeReportPage.vue | 32 ++ .../reading/global-review/index.vue | 32 +- .../reading/reading-task/index.vue | 274 +++++++++--------- vue.config.js | 7 +- 8 files changed, 288 insertions(+), 154 deletions(-) diff --git a/src/api/reading.js b/src/api/reading.js index 9fb24d6b..0f670256 100644 --- a/src/api/reading.js +++ b/src/api/reading.js @@ -171,3 +171,19 @@ export function getCustomTag(param) { data: param }) } + +export function clearSkipReadingCache(param) { + return request({ + url: `/ReadingImageTask/clearSkipReadingCache`, + method: 'post', + data: param + }) +} + +export function setSkipReadingCache(param) { + return request({ + url: `/ReadingImageTask/setSkipReadingCache`, + method: 'post', + data: param + }) +} diff --git a/src/store/modules/reading.js b/src/store/modules/reading.js index 8418f231..6ca73932 100644 --- a/src/store/modules/reading.js +++ b/src/store/modules/reading.js @@ -493,11 +493,10 @@ const actions = { }) }, removeCustomizeMeasuredData({ state }, obj) { - return new Promise(async resolve => { var index = state.visitTaskList.findIndex(i => i.VisitTaskId === obj.visitTaskId) var measureData = state.visitTaskList[index].MeasureData - console.log('removeCustomizeMeasuredData',obj, state.visitTaskList[index].MeasureData) + console.log('removeCustomizeMeasuredData', obj, state.visitTaskList[index].MeasureData) // var uuid = obj.measureData.data.uuid // var idx = measureData.findIndex(item => item.MeasureData && item.MeasureData.data && item.MeasureData.data.uuid === uuid) // console.log(obj, measureData) @@ -682,7 +681,7 @@ const actions = { } else { // state.visitTaskList[index].MeasureData.push(obj.MeasureData.data) state.visitTaskList[index].MeasureData.push({ - MeasureData: obj.measureData , + MeasureData: obj.measureData, SeriesId: obj.measureData.seriesId, StudyId: obj.measureData.studyId, InstanceId: obj.measureData.instanceId, @@ -898,7 +897,7 @@ const actions = { }, setImageloadedInfo({ state }, obj) { var index = state.visitTaskList.findIndex(i => i.VisitTaskId === obj.visitTaskId) - let prefetchInstanceCount = state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].prefetchInstanceCount + const prefetchInstanceCount = state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].prefetchInstanceCount state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].prefetchInstanceCount = prefetchInstanceCount + 100 state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].imageloadedArr.push(obj.imageId) }, diff --git a/src/views/trials/trials-panel/reading/ad-review/index.vue b/src/views/trials/trials-panel/reading/ad-review/index.vue index cb33fb79..17af5722 100644 --- a/src/views/trials/trials-panel/reading/ad-review/index.vue +++ b/src/views/trials/trials-panel/reading/ad-review/index.vue @@ -242,6 +242,10 @@
+ + + {{ $t('trials:readingReport:button:skip') }} + {{ $t('common:button:save') }} @@ -317,6 +321,7 @@ import { getJudgeReadingInfo, // uploadJudgeTaskImage, saveJudgeVisitTaskResult, submitJudgeVisitTaskResult, getReadingPastResultList } from '@/api/trials' import { getAutoCutNextTask } from '@/api/user' +import { setSkipReadingCache } from '@/api/reading' import const_ from '@/const/sign-code' import { getToken } from '@/utils/auth' import SignForm from '@/views/trials/components/newSignForm' @@ -390,7 +395,7 @@ export default { judgeResultArmEnum: '', criterionType: null, openWindow: null, - isFixed:false + isFixed: false } }, // watch: { @@ -716,6 +721,28 @@ export default { var idx = this.fileList.findIndex(i => i.url === file.url) if (idx === -1) return this.fileList.splice(idx, 1) + }, + async skipTask() { + try { + // 是否确认跳过？ + const confirm = await this.$confirm( + this.$t('trials:readingReport:message:skipConfirm'), + { + type: 'warning', + distinguishCancelAndClose: true + } + ) + if (confirm !== 'confirm') return + this.loading = true + const res = await setSkipReadingCache({ visitTaskId: this.visitTaskId }) + this.loading = false + if (res.IsSuccess) { + window.location.reload() + } + } catch (e) { + this.loading = false + console.log(e) + } } } } diff --git a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue index ea24a99a..ff001de2 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue @@ -12,6 +12,15 @@ style="margin-right:5px;" @change="handleShowDetail" /> + + + {{ $t('trials:readingReport:button:skip') }} + -

-

+

{{ $t('trials:readingReport:title:sysEvaluationRes') }}{{ $fd('ExistDisease',isExistDisease) }}{{ $t('trials:readingReport:message:msg1') }}

@@ -262,6 +270,7 @@ diff --git a/vue.config.js b/vue.config.js index 0686d418..45f599a4 100644 --- a/vue.config.js +++ b/vue.config.js @@ -63,7 +63,8 @@ module.exports = { // target: 'http://123.56.94.154:8079', // 国内测试环境2 // target: 'http://123.56.94.154:7000', // 国内测试环境2 // target: 'http://123.56.94.154:30668', - target: 'http://106.14.89.110:30000', + // target: 'http://106.14.89.110:30000', + target: 'http://47.117.164.182:7010', // uat // target: 'http://123.56.181.144:7000', changeOrigin: true, secure: false, @@ -94,7 +95,7 @@ module.exports = { ignore: ['.*'] } ]), - process.env.NODE_ENV === 'development' || process.env.VUE_APP_OSS_CONFIG_BUCKET === 'zyypacs-usa' ? function () { } + process.env.NODE_ENV === 'development' || process.env.VUE_APP_OSS_CONFIG_BUCKET === 'zyypacs-usa' ? function() { } : new WebpackAliyunOss({ from: ['./dist/**'], dist: process.env.VUE_APP_OSS_PATH + distDate, @@ -123,7 +124,7 @@ module.exports = { // 生成文件的最大体积 maxAssetSize: 3000000000, // 只给出js的性能提示 - assetFilter: function (assetFileName) { + assetFilter: function(assetFileName) { return assetFileName.endsWith('.js') } },