From 77320ee13265730e54362ca7102ed0313cff3f03 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 20 May 2024 09:39:34 +0800
Subject: [PATCH] =?UTF-8?q?=E9=98=85=E7=89=87=E9=85=8D=E7=BD=AE=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/index.vue                        |  3 ++-
 .../reading/dicoms/components/DicomCanvas.vue    |  4 ++--
 .../reading/dicoms/components/DicomViewer.vue    |  6 +++---
 .../reading/dicoms/components/ReadPage.vue       |  2 +-
 .../reading/dicoms/components/StudyList.vue      |  4 ++--
 .../dicoms/customize/CustomizeDicomCanvas.vue    |  4 ++--
 .../dicoms/customize/CustomizeDicomViewer.vue    |  6 +++---
 .../dicoms/customize/CustomizeReadPage.vue       |  2 +-
 .../dicoms/customize/CustomizeStudyList.vue      |  2 +-
 .../trials/trials-panel/reading/dicoms/index.vue | 16 ++++++++--------
 .../trials-panel/reading/reading-task/index.vue  |  4 ++--
 11 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index c6e6dbb0..06a3042c 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -264,7 +264,8 @@ export default {
           return
         }else if (res.BasicInfo.LoginState === 2) {
           // 本次登录的IP或设备与上次不一致，请确认'
-          this.$alert(this.$t('login:message:login4'), this.$t('common:title:warning'))
+          // this.$alert(this.$t('login:message:login4'), this.$t('common:title:warning'))
+          this.$message.warning(this.$t('login:message:login4'))
         }
         this.$store.dispatch('permission/generateRoutes').then(res => {
           this.loading = false
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
index 1ad5f6ee..d6d7cc23 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
@@ -19,7 +19,7 @@
     </div>
     <!-- 切换访视 -->
     <div
-      v-if="stack.imageRendered && isReadingTaskViewInOrder"
+      v-if="stack.imageRendered && isReadingTaskViewInOrder === 1"
       class="info-visit"
       @dblclick.stop="preventDefault($event)"
     >
@@ -181,7 +181,7 @@ export default {
       required: true
     },
     isReadingTaskViewInOrder: {
-      type: Boolean,
+      type: Number,
       required: true
     },
     customWwcTpl: {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
index 0f619110..11e546d0 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
@@ -26,7 +26,7 @@
                       A
                     </div>
                   </li>
-                  <li v-if="isReadingTaskViewInOrder" class="flex_row" @click.stop="changeLayout('A|B')">
+                  <li v-if="isReadingTaskViewInOrder === 1" class="flex_row" @click.stop="changeLayout('A|B')">
                     <div class="layout_box_1_1">
                       A
                     </div>
@@ -669,7 +669,7 @@ export default {
       required: true
     },
     isReadingTaskViewInOrder: {
-      type: Boolean,
+      type: Number,
       required: true
     },
     isExistsManual: {
@@ -1364,7 +1364,7 @@ export default {
 
         var firstAddSeries = null
         var currentAddSeries = null
-        if (this.isReadingTaskViewInOrder) {
+        if (this.isReadingTaskViewInOrder === 1) {
         // 有序
         // 获取病灶第一次出现的访视序列
           var firstAddVisitTaskId = null
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue b/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue
index 4fc6c6b7..a406553f 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue
@@ -112,7 +112,7 @@ export default {
       required: true
     },
     isReadingTaskViewInOrder: {
-      type: Boolean,
+      type: Number,
       required: true
     },
     isExistsManual: {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue b/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue
index 886fc4c1..1db2d6cb 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue
@@ -368,10 +368,10 @@ export default {
 
     async getInitSeries() {
       var seriesList = []
-      var isReadingTaskViewInOrder = JSON.parse(this.$router.currentRoute.query.isReadingTaskViewInOrder)
+      var isReadingTaskViewInOrder = parseInt(this.$router.currentRoute.query.isReadingTaskViewInOrder)
       var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
       this.studyList = this.visitTaskList[idx].StudyList
-      if (this.visitTaskList[idx].IsBaseLineTask || !isReadingTaskViewInOrder) {
+      if (this.visitTaskList[idx].IsBaseLineTask || isReadingTaskViewInOrder !== 1) {
         // 基线
         const obj = this.getFirstMarkedSeries(this.visitTaskList[idx].MeasureData, [...this.visitTaskList[idx].StudyList])
         if (Object.keys(obj).length !== 0) {
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 3a4bc8a1..3f8dedb8 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue
@@ -19,7 +19,7 @@
     </div>
     <!-- 切换访视 -->
     <div
-      v-if="stack.imageRendered && isReadingTaskViewInOrder"
+      v-if="stack.imageRendered && isReadingTaskViewInOrder === 1"
       class="info-visit"
       @dblclick.stop="preventDefault($event)"
     >
@@ -180,7 +180,7 @@ export default {
       required: true
     },
     isReadingTaskViewInOrder: {
-      type: Boolean,
+      type: Number,
       required: true
     },
     customWwcTpl: {
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 1dccd8d7..714acea8 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue
@@ -26,7 +26,7 @@
                       A
                     </div>
                   </li>
-                  <li v-if="isReadingTaskViewInOrder" class="flex_row" @click.stop="changeLayout('A|B')">
+                  <li v-if="isReadingTaskViewInOrder === 1" class="flex_row" @click.stop="changeLayout('A|B')">
                     <div class="layout_box_1_1">
                       A
                     </div>
@@ -466,7 +466,7 @@ export default {
       required: true
     },
     isReadingTaskViewInOrder: {
-      type: Boolean,
+      type: Number,
       required: true
     },
     IseCRFShowInDicomReading: {
@@ -995,7 +995,7 @@ export default {
 
       var firstAddSeries = null
       var currentAddSeries = null
-      if (this.isReadingTaskViewInOrder) {
+      if (this.isReadingTaskViewInOrder === 1) {
         // 有序
         // 获取病灶第一次出现的访视序列
         var firstAddVisitTaskId = null
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReadPage.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReadPage.vue
index cf1ad0b1..786d6a07 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReadPage.vue
@@ -118,7 +118,7 @@ export default {
       required: true
     },
     isReadingTaskViewInOrder: {
-      type: Boolean,
+      type: Number,
       required: true
     },
 
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 3b2fd7c6..616391dc 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue
@@ -362,7 +362,7 @@ export default {
       var isReadingTaskViewInOrder = JSON.parse(this.$router.currentRoute.query.isReadingTaskViewInOrder)
       var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
       this.studyList = this.visitTaskList[idx].StudyList
-      if (this.visitTaskList[idx].IsBaseLineTask || !isReadingTaskViewInOrder) {
+      if (this.visitTaskList[idx].IsBaseLineTask || isReadingTaskViewInOrder !== 1) {
         // 基线
         const obj = this.getFirstMarkedSeries(this.visitTaskList[idx].MeasureData, [...this.visitTaskList[idx].StudyList])
         if (Object.keys(obj).length !== 0) {
diff --git a/src/views/trials/trials-panel/reading/dicoms/index.vue b/src/views/trials/trials-panel/reading/dicoms/index.vue
index 9add7fb0..32978b6d 100644
--- a/src/views/trials/trials-panel/reading/dicoms/index.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div ref="container" style="width:100%;height:100%" class="dicom-container">
     <!-- 访视阅片 -->
-    <div v-if="(isReadingTaskViewInOrder || (!isReadingTaskViewInOrder && isShow)) && readingCategory=== 1 && CriterionType !== 0" class="reading-wrapper">
+    <div v-if="(isReadingTaskViewInOrder === 1 || ((isReadingTaskViewInOrder !== 1) && isShow)) && readingCategory=== 1 && CriterionType !== 0" class="reading-wrapper">
       <el-tabs v-model="activeName" v-loading="loading" :before-leave="beforeLeave">
         <!-- 阅片 -->
         <el-tab-pane :label="$t('trials:reading:tabTitle:review')" name="read">
@@ -28,7 +28,7 @@
         </el-tab-pane>
       </el-tabs>
     </div>
-    <div v-if="(isReadingTaskViewInOrder || (!isReadingTaskViewInOrder && isShow)) && readingCategory=== 1 && CriterionType === 0" class="reading-wrapper">
+    <div v-if="(isReadingTaskViewInOrder === 1 || ((isReadingTaskViewInOrder !== 1) && isShow)) && readingCategory=== 1 && CriterionType === 0" class="reading-wrapper">
       <el-tabs v-model="activeName" v-loading="loading" :before-leave="beforeLeaveCustomize">
         <!-- 阅片 -->
         <el-tab-pane :label="$t('trials:reading:tabTitle:review')" name="read">
@@ -177,7 +177,7 @@ import OncologyReview from '@/views/trials/trials-panel/reading/oncology-review'
 import ClinicalData from '@/views/trials/trials-panel/reading/clinical-data'
 import DicomEvent from './components/DicomEvent'
 import store from '@/store'
-import { getToken } from '@/utils/auth'
+// import { getToken } from '@/utils/auth'
 import { changeURLStatic } from '@/utils/history.js'
 import requestPoolManager from '@/utils/request-pool'
 export default {
@@ -210,7 +210,7 @@ export default {
       isNeedReadClinicalData: false,
       isReadClinicalData: false,
       digitPlaces: 2,
-      isReadingTaskViewInOrder: false,
+      isReadingTaskViewInOrder: null,
       firstTaskReadingCategory: null,
       criterionType: null,
       readingTool: null,
@@ -242,7 +242,7 @@ export default {
       store.dispatch('reading/setLastCanvasTaskId', '')
       this.isQualityIssueSaved = false
       this.firstTaskReadingCategory = this.readingCategory
-      if (!this.isReadingTaskViewInOrder) {
+      if (this.isReadingTaskViewInOrder !== 1) {
         // 清除缓存visitTaskList
         store.dispatch('reading/resetVisitTasks')
       }
@@ -260,12 +260,12 @@ export default {
     this.subjectCode = this.$router.currentRoute.query.subjectCode
     this.subjectId = this.$router.currentRoute.query.subjectId
     this.visitTaskId = this.$router.currentRoute.query.visitTaskId
-    this.isReadingTaskViewInOrder = JSON.parse(this.$router.currentRoute.query.isReadingTaskViewInOrder)
+    this.isReadingTaskViewInOrder = parseInt(this.$router.currentRoute.query.isReadingTaskViewInOrder)
     this.criterionType = this.$router.currentRoute.query.criterionType
     this.readingTool = this.$router.currentRoute.query.readingTool
     this.TrialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId
     this.isNewSubject = this.$router.currentRoute.query.isNewSubject
-    if (this.isNewSubject && this.isReadingTaskViewInOrder) {
+    if (this.isNewSubject && this.isReadingTaskViewInOrder !== 0) {
       // 已开始受试者${this.subjectCode}阅片任务
       var msg = this.$t('trials:reading:warnning:msg1')
       msg = msg.replace('xxx', this.subjectCode)
@@ -341,7 +341,7 @@ export default {
           this.activeName = 'read'
           this.tabs = [this.activeName]
         }
-        if (this.firstTaskReadingCategory === 1 && res.Result.ReadingCategory === 1 && this.isReadingTaskViewInOrder && flag) {
+        if (this.firstTaskReadingCategory === 1 && res.Result.ReadingCategory === 1 && this.isReadingTaskViewInOrder !== 0 && flag) {
           this.activeName = 'read'
           this.tabs = [this.activeName]
           this.$nextTick(() => {
diff --git a/src/views/trials/trials-panel/reading/reading-task/index.vue b/src/views/trials/trials-panel/reading/reading-task/index.vue
index 8de89eb8..4b457c66 100644
--- a/src/views/trials/trials-panel/reading/reading-task/index.vue
+++ b/src/views/trials/trials-panel/reading/reading-task/index.vue
@@ -2,7 +2,7 @@
   <BaseContainer v-loading="loading" style="height:100%;background-color: #fff;">
     <el-tabs v-if="TrialReadingCriterionId" v-model="TrialReadingCriterionId" type="border-card">
       <el-tab-pane v-for="item of trialCriterionList" :key="item.TrialReadingCriterionId" :label="item.TrialReadingCriterionName" :name="item.TrialReadingCriterionId">
-        <div v-if="isReadingTaskViewInOrder && TrialReadingCriterionId === item.TrialReadingCriterionId">
+        <div v-if="(isReadingTaskViewInOrder === 1 || isReadingTaskViewInOrder === 2) && TrialReadingCriterionId === item.TrialReadingCriterionId">
           <div slot="search-container">
             <el-form :inline="true">
               <!-- 受试者编号 -->
@@ -125,7 +125,7 @@
             <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize" @pagination="getList" />
           </div>
         </div>
-        <div v-else-if="isReadingTaskViewInOrder === false && TrialReadingCriterionId === item.TrialReadingCriterionId">
+        <div v-else-if="isReadingTaskViewInOrder === 0 && TrialReadingCriterionId === item.TrialReadingCriterionId">
           <el-descriptions :column="2" border style="width:800px">
             <!-- 剩余任务量 -->
             <el-descriptions-item :label="$t('trials:pendingReadingTasks:table:remainingTaskVolume')" :label-style="{'width':'200px'}">