From 403008c25fcc2f6a511a90296a485734873b382b Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 18 Jul 2024 14:45:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=87=8D=E7=BD=AE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/ReportPage.vue  |  1 -
 .../dicoms/customize/CustomizeDicomCanvas.vue |  2 +-
 .../dicoms/customize/CustomizeDicomViewer.vue |  1 +
 .../customize/CustomizeMeasurementList.vue    | 69 +++++++++++++++++--
 .../dicoms/customize/CustomizeStudyList.vue   |  6 +-
 5 files changed, 69 insertions(+), 10 deletions(-)

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 608d0942..22ef2210 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
@@ -450,7 +450,6 @@ export default {
           if (this.$refs.reportList) {
             this.getTableHeight()
             this.$refs.reportList.bodyWrapper.scrollTop = this.$refs.reportList.bodyWrapper.scrollHeight
-            this.$refs.reportList.bodyWrapper.scrollTop = this.$refs.reportList.bodyWrapper.scrollHeight
           }
         })
       }, 50)
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue
index c5793fb1..b446a7e9 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue
@@ -670,7 +670,7 @@ export default {
       this.sliderInfo.isMove = false
     },
     getMeasureData() {
-      console.log('getMeasureData')
+      console.log('getMeasureData') 
       var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.stack.visitTaskId)
       this.measureData = this.visitTaskList[idx].MeasureData
       const ToolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue
index 8407b933..cea40aa7 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue
@@ -993,6 +993,7 @@ export default {
       }
       console.log('getMeasureData')
     })
+    
     DicomEvent.$on('getScreenshots', (callback) => {
       var base64Str =
         this.$refs[
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeMeasurementList.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeMeasurementList.vue
index bf0c6354..28ccfeef 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeMeasurementList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeMeasurementList.vue
@@ -2,10 +2,20 @@
   <div class="measurement-wrapper" :style="{'height':height+10+'px'}" style="position: relative">
 
     <div class="container" :style="{'height':height+'px'}" style="padding-bottom: 50px;overflow-y: auto;">
-      <h3 style="color: #ddd;padding: 5px 0px;margin: 0;" v-if="isReadingShowSubjectInfo">
-        <span v-if="subjectCode">{{ subjectCode }} </span>
-        <span style="margin-left:5px;">{{ taskBlindName }}</span>
-      </h3>
+      <div class="basic-info">
+        <h3 v-if="isReadingShowSubjectInfo">
+          <span v-if="subjectCode">{{ subjectCode }} </span>
+          <span style="margin-left:5px;">{{ taskBlindName }}</span>
+        </h3>
+        <div v-if="readingTaskState < 2">
+          <el-tooltip class="item" effect="dark" :content="$t('trials:dicomReading:message:confirmReset')" placement="bottom">
+            <i
+              class="el-icon-refresh-left"
+              @click="resetMeasuredData"
+            />
+          </el-tooltip>
+        </div>
+      </div>
       <QuestionsPreview
         ref="QuestionsPreview"
         v-if="ecrfShow"
@@ -77,7 +87,7 @@
 </template>
 <script>
 import { submitDicomVisitTask } from '@/api/trials'
-import { getCustomTag, submitCustomTag, deleteCustomTag } from '@/api/reading'
+import { getCustomTag, submitCustomTag, resetReadingTask } from '@/api/reading'
 import DicomEvent from './../components/DicomEvent'
 import SignForm from '@/views/trials/components/newSignForm'
 import QuestionsPreview from './CustomizeQuestionsPreview'
@@ -320,7 +330,7 @@ export default {
               distinguishCancelAndClose: true
             })
               .then(() => {
-                try {DicomEvent.$emit('getNextTask')} catch (e) {console.log(e)}
+                window.location.reload()
               })
               .catch(action => {
               })
@@ -357,7 +367,36 @@ export default {
         this.activeName = ''
         this.ecrfShow = true
       }
-    }
+    },
+    async resetMeasuredData() {
+      const confirm = await this.$confirm(
+        this.$t('trials:dicomReading:message:confirmReset1'),
+        this.$t('trials:dicomReading:message:confirmReset2'),
+        {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        }
+      )
+      if (confirm !== 'confirm') return
+      const loading = this.$loading({ fullscreen: true })
+      try {
+        const res = await resetReadingTask({ visitTaskId: this.visitTaskId })
+        this.loading = false
+        if (res.IsSuccess) {
+          // 刷新标注、表单、报告页信息
+          this.activeName = ''
+          this.$refs['QuestionsPreview'].getCustomTableQuestionAnswer(this.visitTaskId )
+          await store.dispatch('reading/refreshCustomizeMeasuredData', this.visitTaskId)
+          DicomEvent.$emit('getMeasureData')
+          DicomEvent.$emit('getReportInfo', true)
+          DicomEvent.$emit('refreshStudyListMeasureData')
+        }
+        loading.close()
+      } catch (e) {
+        loading.close()
+        console.log(e)
+      }
+    },
   }
 }
 </script>
@@ -368,6 +407,22 @@ export default {
 
   .container{
     padding: 10px;
+    .basic-info{
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      h3{
+        color: #ddd;
+        padding: 5px 0px;
+        margin: 0;
+      }
+      i{
+        color: #fff;
+        font-size: 22px;
+        font-weight: bold;
+        cursor: pointer;
+      }
+    }
   }
   .title{
     padding: 5px;
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue
index 6dfe9c03..0184a1f9 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue
@@ -257,7 +257,10 @@ export default {
     this.subjectCode = localStorage.getItem('subjectCode')
     var digitPlaces = Number(localStorage.getItem('digitPlaces'))
     this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
-
+    DicomEvent.$on('refreshStudyListMeasureData', () => {
+      var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
+      this.measureData = this.visitTaskList[idx].MeasureData
+    })
     // DicomEvent.$on('setReadingState', readingTaskState => {
     //   var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
     //   if (idx > -1) {
@@ -271,6 +274,7 @@ export default {
     window.addEventListener('beforeunload', e => {
       cornerstone.imageCache.purgeCache()
     })
+
   },
   beforeDestroy() {
     cornerstone.imageCache.purgeCache()