src/views/trials/trials-panel/reading/dicoms/components/NoneDicomsCanvas.vue

@@ -76,7 +76,6 @@
   </div>
 </template>
 <script>
-import { getTableAnswerRowInfoList } from '@/api/trials'
 import { on, off } from 'element-ui/src/utils/dom'
 import { rafThrottle, isFirefox } from 'element-ui/src/utils/util'
 import store from '@/store'
@@ -224,26 +223,15 @@ export default {
       return new Promise(async resolve => {
         this.visitTaskId = this.$router.currentRoute.query.visitTaskId
         this.canvasData = []
-        let res = await getTableAnswerRowInfoList(this.visitTaskId)
-        res.Result.forEach(el => {
-          if (!el.IsDicomReading){
-            if (el.MeasureData) {
-              el.MeasureData = JSON.parse(el.MeasureData)
-              el.MeasureData.data.remark = el.OrderMarkName
-              this.canvasData.push(el.MeasureData)
+        await store.dispatch('reading/getMeasuredData', this.visitTaskId)
+        await store.dispatch('reading/getNoneDicomMeasuredData', this.visitTaskId).then(res => {
+          res.forEach(item => {
+            if (item && item.MeasureData) {
+              this.canvasData.push(item.MeasureData)
             }
-          }  
+          })
+          sessionStorage.setItem('measureData', this.canvasData)
         })
-        sessionStorage.setItem('measureData', this.canvasData)
-        // await store.dispatch('reading/getMeasuredData', this.visitTaskId)
-        // await store.dispatch('reading/getNoneDicomMeasuredData', this.visitTaskId).then(res => {
-        //   res.forEach(item => {
-        //     if (item && item.MeasureData) {
-        //       this.canvasData.push(item.MeasureData)
-        //     }
-        //   })
-        //   sessionStorage.setItem('measureData', this.canvasData)
-        // })
         resolve()
       })
     },