Merge branch 'uat' of https://gitea.frp.extimaging.com/XCKJ/irc_web into uat

src/views/trials/trials-panel/reading/ad-review/index.vue

@@ -227,18 +227,7 @@
               </span>
             </div>
           </el-upload>
-          <el-dialog
+          
-            append-to-body
-            :visible.sync="imgVisible"
-            width="600px"
-          >
-            <!-- <img width="100%" :src="imageUrl" alt="图片未找到"> -->
-            <el-image :src="imageUrl" width="100%" crossorigin="anonymous">
-              <div slot="placeholder" class="image-slot">
-                {{ $t('trials:adReview:title:loading') }}<span class="dot">...</span>
-              </div>
-            </el-image>
-          </el-dialog>
         </el-form-item>
         <el-form-item v-if="adInfo.ReadingTaskState < 2">
           <div style="text-align:center;">
@@ -314,6 +303,9 @@
       </div>
       <SignForm ref="signForm" :sign-code-enum="signCode" @closeDialog="closeSignDialog" />
     </el-dialog>
+    <viewer v-if="imgVisible" :images="[imageUrl]" ref="viewer">
+      <img :src="imageUrl"  crossorigin="anonymous" alt="">
+    </viewer>
   </div>
 </template>
 <script>
@@ -328,6 +320,7 @@ import SignForm from '@/views/trials/components/newSignForm'
 import DicomEvent from '@/views/trials/trials-panel/reading/dicoms/components/DicomEvent'
 import store from '@/store'
 import { changeURLStatic } from '@/utils/history.js'
+import Viewer from 'v-viewer'
 export default {
   name: 'AdReview',
   components: { SignForm },
@@ -412,6 +405,7 @@ export default {
   //   }
   // },
   mounted() {
+    this.initializeViewer()
     this.criterionType = parseInt(this.$route.query.criterionType)
     this.getAdInfo()
     if (this.isReadingShowPreviousResults) {
@@ -715,6 +709,7 @@ export default {
     handlePictureCardPreview(file) {
       this.imageUrl = this.OSSclientConfig.basePath + file.url
       this.imgVisible = true
+      this.$refs.viewer.$viewer.show()
     },
     // 删除图片
     handleRemove(file, fileList) {
@@ -743,6 +738,11 @@ export default {
         this.loading = false
         console.log(e)
       }
+    },
+    initializeViewer() {
+      Viewer.setDefaults({
+        toolbar: { zoomIn: true, zoomOut: true, rotateLeft: true, rotateRight: true, flipHorizontal: true, flipVertical: true }
+      })
     }
   }
 }

src/views/trials/trials-panel/reading/oncology-review/index.vue

@@ -26,6 +26,14 @@
         >
           {{ $t('trials:oncologyReview:button:clinicalData') }}
         </el-button>
+        <el-button
+          type="primary"
+          size="small"
+          @click="skipTask"
+        >
+          <!-- 跳过 -->
+          {{ $t('trials:readingReport:button:skip') }}
+        </el-button>
         <!-- 保存 -->
         <el-button
           v-if="oncologyInfo.ReadingTaskState < 2"
@@ -253,6 +261,7 @@
 </template>
 <script>
 import { getOncologyReadingInfo, getReadingPastResultList, setOncologyReadingInfo, submitOncologyReadingInfo } from '@/api/trials'
+import { setSkipReadingCache } from '@/api/reading'
 import const_ from '@/const/sign-code'
 import { getToken } from '@/utils/auth'
 import DicomEvent from '@/views/trials/trials-panel/reading/dicoms/components/DicomEvent'
@@ -554,6 +563,28 @@ export default {
         path: `/clinicalData?subjectId=${this.oncologyInfo.SubjectId}&trialId=${this.trialId}&visitTaskId=${this.oncologyInfo.OncologyTaskId}&TokenKey=${token}`
       })
       window.open(routeData.href, '_blank')
+    },
+    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)
+      }
     }
   }
 }