阅片添加跳过当前任务功能

2024-07-15 14:50:50 +08:00 · 2024-07-15 14:50:50 +08:00 · fd0679dbd8
parent 6137d9deff
commit fd0679dbd8
8 changed files with 288 additions and 154 deletions
--- 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
+  })
+}
--- 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)
  },
--- 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 @@
        </el-form-item>
        <el-form-item v-if="adInfo.ReadingTaskState < 2">
          <div style="text-align:center;">
+            <el-button type="primary" @click="skipTask">
+              <!-- 跳过 -->
+              {{ $t('trials:readingReport:button:skip') }}
+            </el-button>
            <!-- 保存 -->
            <el-button type="primary" @click="handleSave">{{ $t('common:button:save') }}</el-button>
            <!-- 提交 -->
@ -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)
+      }
    }
  }
 }
--- 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"
          />
+          <el-button
+            v-if="readingTaskState<2"
+            type="primary"
+            size="small"
+            @click="skipTask"
+          >
+            <!-- 跳过 -->
+            {{ $t('trials:readingReport:button:skip') }}
+          </el-button>
          <el-button
            v-if="readingTaskState<2"
            type="primary"
@ -172,8 +181,7 @@
                        @change="evaluateReasonChange"
                      />
                      <!-- 系统评估结果为：xxx,与当前调整的结果不一致，请填写调整原因 -->
-                      <p v-if="currentEvaluateResult !== tumorEvaluate" style="width: 140px;padding:0 2px;white-space: normal;word-break: break-all;word-wrap: break-word;" v-html="getWarningText()">
-                      </p>
+                      <p v-if="currentEvaluateResult !== tumorEvaluate" style="width: 140px;padding:0 2px;white-space: normal;word-break: break-all;word-wrap: break-word;" v-html="getWarningText()" />
                      <p v-else-if="currentExistDisease !== isExistDisease" style="width: 140px;padding:0 2px;white-space: normal;word-break: break-all;word-wrap: break-word;">{{ $t('trials:readingReport:title:sysEvaluationRes') }}<span style="color:red">{{ $fd('ExistDisease',isExistDisease) }}</span>{{ $t('trials:readingReport:message:msg1') }}
                      </p>
                    </template>
@ -262,6 +270,7 @@
 </template>
 <script>
 import { getReadingReportEvaluation, changeDicomReadingQuestionAnswer, submitDicomVisitTask, verifyVisitTaskQuestions, getTaskAdditionalQuestion } from '@/api/trials'
+import { setSkipReadingCache } from '@/api/reading'
 import { getAutoCutNextTask } from '@/api/user'
 import DicomEvent from './DicomEvent'
 import const_ from '@/const/sign-code'
@ -816,14 +825,36 @@ export default {
      var sysRes = ''
      var curRes = ''
      if (this.CriterionType === 2) {
-        sysRes = this.$fd('ImagingOverallAssessment_Lugano',this.tumorEvaluate)
-        curRes = this.$fd('ImagingOverallAssessment_Lugano',this.currentEvaluateResult)
+        sysRes = this.$fd('ImagingOverallAssessment_Lugano', this.tumorEvaluate)
+        curRes = this.$fd('ImagingOverallAssessment_Lugano', this.currentEvaluateResult)
      } else {
-        sysRes = this.$fd('OverallAssessment',this.tumorEvaluate)
-        curRes = this.$fd('OverallAssessment',this.currentEvaluateResult)
+        sysRes = this.$fd('OverallAssessment', this.tumorEvaluate)
+        curRes = this.$fd('OverallAssessment', this.currentEvaluateResult)
      }
-      let msg = this.$t('trials:readingReport:message:msg9').replace('xxx','<font color="red">' + sysRes + '</font>').replace('yyy','<font color="red">' + curRes + '</font>')
+      const msg = this.$t('trials:readingReport:message:msg9').replace('xxx', '<font color="red">' + sysRes + '</font>').replace('yyy', '<font color="red">' + curRes + '</font>')
      return msg
+    },
+    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)
+      }
    }
  }
 }
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReportPage.vue
@ -11,6 +11,15 @@
            style="margin-right:5px"
            @change="handleShowDetail"
          />
+          <el-button
+            v-if="readingTaskState<2"
+            type="primary"
+            size="small"
+            @click="skipTask"
+          >
+            <!-- 跳过 -->
+            {{ $t('trials:readingReport:button:skip') }}
+          </el-button>
          <el-button v-if="readingTaskState<2" type="primary" size="small" @click="getReportInfo">{{$t('trials:readingReport:button:refresh')}}</el-button>
          <el-button v-if="readingTaskState<2" type="primary" size="small" @click="handleSave(true)">{{$t('common:button:save')}}</el-button>
          <el-button v-if="readingTaskState<2" type="primary" size="small" @click="handleConfirm">{{$t('common:button:submit')}}</el-button>
@ -260,6 +269,7 @@
 </template>
 <script>
 import { changeCalculationAnswer, getReadingReportEvaluation, changeDicomReadingQuestionAnswer, submitDicomVisitTask, verifyVisitTaskQuestions, getQuestionCalculateRelation } from '@/api/trials'
+import { setSkipReadingCache } from '@/api/reading'
 import DicomEvent from './../components/DicomEvent'
 import CustomizeReportPageUpload from './CustomizeReportPageUpload'
 import const_ from '@/const/sign-code'
@ -828,6 +838,28 @@ export default {
          reject()
        })
      })
+    },
+    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)
+      }
    }
  }
 }
--- a/src/views/trials/trials-panel/reading/global-review/index.vue
+++ b/src/views/trials/trials-panel/reading/global-review/index.vue
@ -25,7 +25,14 @@
      </div>

      <div v-if=" readingTaskState < 2" style="text-align:right;margin:5px 0;">
-
+        <el-button
+            type="primary"
+            size="small"
+            @click="skipTask"
+          >
+            <!-- 跳过 -->
+            {{ $t('trials:readingReport:button:skip') }}
+          </el-button>
        <el-button size="small" type="primary" @click="handleSave">
          {{ $t('common:button:save') }}
        </el-button>
@ -142,6 +149,7 @@
 <script>
 import { getGlobalReadingInfo, getReadingPastResultList, submitGlobalReadingInfo, saveGlobalReadingInfo } from '@/api/trials'
 import { getAutoCutNextTask } from '@/api/user'
+import { setSkipReadingCache } from '@/api/reading'
 import { getToken } from '@/utils/auth'
 import const_ from '@/const/sign-code'
 import DicomEvent from '@/views/trials/trials-panel/reading/dicoms/components/DicomEvent'
@ -377,6 +385,28 @@ export default {
    handleSave() {
      this.$refs['globalTbl'].handleSave(true)
    },
+    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)
+      }
+    },
    async handleConfirm() {
      // 判断是否存在访视评估结果未确认
      var idx = this.taskList.findIndex(i => !i.AgreeOrNotAnswer)
--- a/src/views/trials/trials-panel/reading/reading-task/index.vue
+++ b/src/views/trials/trials-panel/reading/reading-task/index.vue
@ -18,7 +18,7 @@
          v-if="
            (isReadingTaskViewInOrder === 1 ||
              isReadingTaskViewInOrder === 2) &&
-            TrialReadingCriterionId === item.TrialReadingCriterionId
+              TrialReadingCriterionId === item.TrialReadingCriterionId
          "
        >
          <div slot="search-container">
@ -75,11 +75,10 @@
                      scope.row.UrgentColor === 1
                        ? 'danger'
                        : scope.row.UrgentColor === 2
-                        ? 'warning'
-                        : 'primary'
+                          ? 'warning'
+                          : 'primary'
                    "
-                    >{{ $fd("YesOrNo", scope.row.IsUrgent) }}</el-tag
-                  >
+                  >{{ $fd("YesOrNo", scope.row.IsUrgent) }}</el-tag>
                </template>
              </el-table-column>
              <!-- 受试者编号 -->
@ -114,11 +113,10 @@
                        scope.row.UrgentColor === 1
                          ? '#F56C6C'
                          : scope.row.UrgentColor === 2
-                          ? '#E6A23C'
-                          : '#409EFF',
+                            ? '#E6A23C'
+                            : '#409EFF',
                    }"
-                    >{{ scope.row.UrgentCount }}</span
-                  >
+                  >{{ scope.row.UrgentCount }}</span>
                </template>
              </el-table-column>
              <!-- 建议完成时间 -->
@ -148,8 +146,8 @@
                    :title="
                      scope.row.ExistReadingApply
                        ? $t(
-                            'trials:pendingReadingTasks:button:ExistReadingApply'
-                          )
+                          'trials:pendingReadingTasks:button:ExistReadingApply'
+                        )
                        : $t('trials:pendingReadingTasks:button:review')
                    "
                    icon="el-icon-edit-outline"
@ -157,12 +155,12 @@
                  />
                  <!-- 上传 -->
                  <el-button
-                    v-hasPermi="['role:ir']"
                    v-if="
                      item.CriterionType === 0 &&
-                      item.ImageUploadEnum > 0 &&
-                      item.IsReadingTaskViewInOrder > 0
+                        item.ImageUploadEnum > 0 &&
+                        item.IsReadingTaskViewInOrder > 0
                    "
+                    v-hasPermi="['role:ir']"
                    circle
                    icon="el-icon-upload2"
                    :title="$t('trials:pendingReadingTasks:button:upload')"
@ -170,12 +168,12 @@
                  />
                  <!-- 下载 -->
                  <el-button
-                    v-hasPermi="['role:ir']"
                    v-if="
                      item.CriterionType === 0 &&
-                      item.ImageDownloadEnum === 1 &&
-                      item.IsReadingTaskViewInOrder > 0
+                        item.ImageDownloadEnum === 1 &&
+                        item.IsReadingTaskViewInOrder > 0
                    "
+                    v-hasPermi="['role:ir']"
                    circle
                    icon="el-icon-download"
                    :title="$t('trials:pendingReadingTasks:button:download')"
@ -196,7 +194,7 @@
        <div
          v-else-if="
            isReadingTaskViewInOrder === 0 &&
-            TrialReadingCriterionId === item.TrialReadingCriterionId
+              TrialReadingCriterionId === item.TrialReadingCriterionId
          "
        >
          <el-descriptions :column="2" border style="width: 800px">
@ -250,7 +248,7 @@
                :disabled="
                  randomReadInfo.UnReadTaskCount +
                    randomReadInfo.UnReadJudgeTaskCount ===
-                  0
+                    0
                "
                @click="handleOutOfOrderReading"
              >
@ -264,8 +262,8 @@
    <upload-image
      v-if="uploadImageVisible"
      :visible.sync="uploadImageVisible"
-      :SubjectId="uploadSubjectId"
-      :Criterion="uploadTrialCriterion"
+      :subject-id="uploadSubjectId"
+      :criterion="uploadTrialCriterion"
      :status="uploadStatus"
      @getList="getList"
    />
@ -274,35 +272,36 @@
 <script>
 import {
  getIRUnReadSubjectTaskList,
-  verifyReadingRestTime,
-} from "@/api/trials";
-import { getTrialCriterionList } from "@/api/trials/reading";
-import BaseContainer from "@/components/BaseContainer";
-import uploadImage from "@/components/uploadImage";
-import Pagination from "@/components/Pagination";
-import { getToken } from "@/utils/auth";
+  verifyReadingRestTime
+} from '@/api/trials'
+import { getTrialCriterionList } from '@/api/trials/reading'
+import { clearSkipReadingCache } from '@/api/reading'
+import BaseContainer from '@/components/BaseContainer'
+import uploadImage from '@/components/uploadImage'
+import Pagination from '@/components/Pagination'
+import { getToken } from '@/utils/auth'
 const searchDataDefault = () => {
  return {
-    SubjectCode: "",
+    SubjectCode: '',
    PageIndex: 1,
-    PageSize: 20,
-  };
-};
+    PageSize: 20
+  }
+}
 export default {
-  name: "ReadingTaskList",
-  components: { BaseContainer, Pagination, "upload-image": uploadImage },
+  name: 'ReadingTaskList',
+  components: { BaseContainer, Pagination, 'upload-image': uploadImage },
  data() {
    return {
      searchData: searchDataDefault(),
      list: [],
      total: 0,
      loading: false,
-      trialId: "",
+      trialId: '',
      isReadingTaskViewInOrder: null,
      randomReadInfo: {},
      isRender: false,
      trialCriterionList: [],
-      TrialReadingCriterionId: "",
+      TrialReadingCriterionId: '',
      isTableShow: true,
      readingTool: null,
      criterionType: null,
@ -312,147 +311,146 @@ export default {
      uploadImageVisible: false,
      uploadSubjectId: null,
      uploadTrialCriterion: {},
-      uploadStatus: "upload",
-    };
+      uploadStatus: 'upload'
+    }
  },
  watch: {
    TrialReadingCriterionId(v) {
      if (v) {
-        this.getList();
+        this.getList()
      }
-    },
+    }
  },
  mounted() {
-    window.addEventListener("message", this.receiveMsg);
-    this.trialId = this.$route.query.trialId;
-    this.getTrialCriterionList();
+    window.addEventListener('message', this.receiveMsg)
+    this.trialId = this.$route.query.trialId
+    this.getTrialCriterionList()
  },
  beforeDestroy() {
-    window.removeEventListener("message", this.receiveMsg);
+    window.removeEventListener('message', this.receiveMsg)
    if (this.openWindow) {
-      this.openWindow.close();
+      this.openWindow.close()
    }
  },
  methods: {
    // 打开上传下载弹框
    openUploadImage(item, trialCriterion, status) {
-      this.uploadSubjectId = item.SubjectId;
-      this.uploadTrialCriterion = trialCriterion;
-      this.uploadStatus = status;
-      this.uploadImageVisible = true;
+      this.uploadSubjectId = item.SubjectId
+      this.uploadTrialCriterion = trialCriterion
+      this.uploadStatus = status
+      this.uploadImageVisible = true
    },
-    getTrialCriterionList() {
-      getTrialCriterionList(this.trialId)
-        .then((res) => {
-          this.trialCriterionList = res.Result;
+    async getTrialCriterionList() {
+      try {
+        const res = await getTrialCriterionList(this.trialId)
+        if (res.IsSuccess) {
+          this.trialCriterionList = res.Result
          this.TrialReadingCriterionId =
-            this.trialCriterionList[0].TrialReadingCriterionId;
-        })
-        .catch(() => {});
+            this.trialCriterionList[0].TrialReadingCriterionId
+        }
+      } catch (e) {
+        console.log(e)
+      }
    },
-    getList() {
-      this.loading = true;
-      this.searchData.TrialId = this.trialId;
-      this.searchData.TrialReadingCriterionId = this.TrialReadingCriterionId;
-      this.isRender = false;
-      getIRUnReadSubjectTaskList(this.searchData)
-        .then((res) => {
+    async getList() {
+      try {
+        this.loading = true
+        this.searchData.TrialId = this.trialId
+        this.searchData.TrialReadingCriterionId = this.TrialReadingCriterionId
+        this.isRender = false
+        const res = await getIRUnReadSubjectTaskList(this.searchData)
+        if (res.IsSuccess) {
          this.isReadingTaskViewInOrder =
-            res.OtherInfo.IsReadingTaskViewInOrder;
-          this.readingTool = res.OtherInfo.ReadingTool;
-          this.criterionType = res.OtherInfo.CriterionType;
+            res.OtherInfo.IsReadingTaskViewInOrder
+          this.readingTool = res.OtherInfo.ReadingTool
+          this.criterionType = res.OtherInfo.CriterionType
          if (res.OtherInfo.IsReadingTaskViewInOrder) {
-            this.list = res.Result.CurrentPageData;
-            this.total = res.Result.TotalCount;
+            this.list = res.Result.CurrentPageData
+            this.total = res.Result.TotalCount
          } else {
-            this.randomReadInfo = res.OtherInfo.RandomReadInfo;
+            this.randomReadInfo = res.OtherInfo.RandomReadInfo
          }
-          this.isRender = true;
-          this.loading = false;
-        })
-        .catch(() => {
-          this.isRender = true;
-          this.loading = false;
-        });
+          this.isRender = true
+          this.loading = false
+        }
+      } catch (e) {
+        this.isRender = true
+        this.loading = false
+      }
    },
    handleSearch() {
-      this.searchData.PageIndex = 1;
-      this.getList();
+      this.searchData.PageIndex = 1
+      this.getList()
    },
    handleReset() {
-      this.searchData = searchDataDefault();
-      this.getList();
+      this.searchData = searchDataDefault()
+      this.getList()
    },
-    handleReadImage(row) {
+    async handleReadImage(row) {
      if (this.openWindow) {
-        this.openWindow.close();
+        this.openWindow.close()
      }
-      this.loading = true;
-      verifyReadingRestTime()
-        .then((_) => {
-          this.loading = false;
+      try {
+        this.loading = true
+        await clearSkipReadingCache()
+        await verifyReadingRestTime()
+        this.loading = false
+        window.localStorage.setItem('TrialReadingCriterionId', this.TrialReadingCriterionId)
+        var token = getToken()
+        var path = ''
+        if (this.readingTool === 0) {
+          path = `/readingDicoms?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${row.SubjectCode}&subjectId=${row.SubjectId}&isReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&TokenKey=${token}`
+        } else {
+          path = `/noneDicomReading?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${row.SubjectCode}&subjectId=${row.SubjectId}&isReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&TokenKey=${token}`
+        }
+        var routeData = this.$router.resolve({ path })

-          window.localStorage.setItem(
-            "TrialReadingCriterionId",
-            this.TrialReadingCriterionId
-          );
-          var token = getToken();
-          var path = "";
-          if (this.readingTool === 0) {
-            path = `/readingDicoms?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${row.SubjectCode}&subjectId=${row.SubjectId}&isReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&TokenKey=${token}`;
-          } else {
-            path = `/noneDicomReading?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${row.SubjectCode}&subjectId=${row.SubjectId}&isReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&TokenKey=${token}`;
-          }
-          var routeData = this.$router.resolve({ path });
-
-          this.openWindow = window.open(routeData.href, "_blank");
-        })
-        .catch(() => {
-          this.loading = false;
-        });
+        this.openWindow = window.open(routeData.href, '_blank')
+      } catch (e) {
+        this.loading = false
+        console.log(e)
+      }
    },
-    handleOutOfOrderReading() {
+    async handleOutOfOrderReading() {
      if (this.openWindow) {
-        this.openWindow.close();
+        this.openWindow.close()
+      }
+      try {
+        this.loading = true
+        await clearSkipReadingCache()
+        await verifyReadingRestTime()
+        this.loading = false
+        window.localStorage.setItem('TrialReadingCriterionId', this.TrialReadingCriterionId)
+        var token = getToken()
+        var path = ''
+        if (this.readingTool === 0) {
+          path = `/readingDicoms?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&isReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&TokenKey=${token}`
+        } else {
+          path = `/noneDicomReading?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&isReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&TokenKey=${token}`
+        }
+        var routeData = this.$router.resolve({ path })
+        this.openWindow = window.open(routeData.href, '_blank')
+      } catch (e) {
+        this.loading = false
+        console.log(e)
      }
-      this.loading = true;
-      verifyReadingRestTime()
-        .then((_) => {
-          this.loading = false;
-          window.localStorage.setItem(
-            "TrialReadingCriterionId",
-            this.TrialReadingCriterionId
-          );
-          var token = getToken();
-          var path = "";
-          if (this.readingTool === 0) {
-            path = `/readingDicoms?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&isReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&TokenKey=${token}`;
-          } else {
-            path = `/noneDicomReading?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&isReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&TokenKey=${token}`;
-          }
-          var routeData = this.$router.resolve({ path });
-          this.openWindow = window.open(routeData.href, "_blank");
-        })
-        .catch(() => {
-          this.loading = false;
-        });
    },
    receiveMsg(event) {
-      if (event.data === "refreshTaskList") {
-        this.getList();
+      if (event.data === 'refreshTaskList') {
+        this.getList()
      }
    },
    // 排序
    handleSortChange(column) {
-      if (column.order === "ascending") {
-        this.searchData.Asc = true;
+      if (column.order === 'ascending') {
+        this.searchData.Asc = true
      } else {
-        this.searchData.Asc = false;
+        this.searchData.Asc = false
      }
-      this.searchData.SortField = column.prop;
-      this.searchData.PageIndex = 1;
-      this.getList();
-    },
-  },
-};
+      this.searchData.SortField = column.prop
+      this.searchData.PageIndex = 1
+      this.getList()
+    }
+  }
+}
 </script>
--- 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')
      }
    },