From 425782e015443268a90459028b82a520d640e22e Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 12 Apr 2024 13:43:43 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A8=BD=E6=9F=A5=E6=96=87=E4=BB=B6=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E5=8F=8A=E8=B7=AF=E7=94=B1=E8=B7=B3=E8=BD=AC=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8Bbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/permission.js                             |  4 ++
 .../trial-summary/audit-record/index.vue      | 42 ++++++++++++-------
 2 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/src/permission.js b/src/permission.js
index 3086972f..5a09cd1e 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -21,6 +21,7 @@ router.beforeEach(async(to, from, next) => {
   const hasToken = getToken()
   Vue.prototype.toPath = to.path
   Vue.prototype.$path = []
+  console.log(11222)
   if (hasToken) {
     if (to.path === '/login' || to.path === '/recompose' || to.path === '/email-recompose' || to.path === '/error' || to.path === '/ReviewersResearchForm' || to.path === '/ReviewersResearch') {
       if (to.path === '/ReviewersResearch') {
@@ -56,6 +57,9 @@ router.beforeEach(async(to, from, next) => {
     /* has no token*/
     if (whiteList.indexOf(to.path) !== -1) {
       // 在免登录whiteList中，直接进入
+      if (to.path === '/readingDicoms'){
+        OSSclient()
+      }
       next()
     } else {
       if (to.path === '/researchForm') {
diff --git a/src/views/trials/trials-panel/trial-summary/audit-record/index.vue b/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
index 838f6bbf..66ff948e 100644
--- a/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
@@ -311,6 +311,7 @@
             border
             style="width: 100%"
             size="small"
+            max-height="400"
           >
           <!-- 字段名 -->
             <el-table-column
@@ -328,10 +329,10 @@
               <template slot-scope="scope">
                  <span>
                   <!-- 查看详情 -->
-                   <a v-if="scope.row.DataType === 'OSS'" target="_blank" :href="OSSclientConfig.basePath + scope.row.oldValue">
+                   <a v-if="scope.row.DataType === 'OSS' && scope.row.oldValue && scope.row.oldValue !== '--'" target="_blank" :href="OSSclientConfig.basePath + scope.row.oldValue" style="color:#409eff;">
                     {{$t('common:button:download')}}
                   </a>
-                  <a v-else-if="scope.row.DataType === 'Link' || scope.row.DataType === 'Router'" target="_blank" :href="scope.row.oldValue">
+                  <a v-else-if="(scope.row.DataType === 'Link' || scope.row.DataType === 'Router') && scope.row.oldValue && scope.row.oldValue !== '--'" target="_blank" :href="scope.row.oldValue"  style="color:#409eff;">
                     {{$t('trials:auditRecord:title:viewDetail')}}
                   </a>
                    <viewer v-else-if="(scope.row.DataType === 'Image' || scope.row.DataType === 'ImageList') && scope.row.oldValue && scope.row.oldValue !== '--'" :ref="scope.row.oldValue" :images="imagesList">
@@ -357,10 +358,10 @@
               <template slot-scope="scope">
                 <span :style="{ color: scope.row.newValue !== scope.row.oldValue ? '#f66' : null }">
                   <!-- 查看详情 -->
-                  <a v-if="scope.row.DataType === 'OSS'" target="_blank" :href="OSSclientConfig.basePath + scope.row.newValue">
+                  <a v-if="scope.row.DataType === 'OSS' && scope.row.newValue && scope.row.newValue !== '--'" target="_blank" :href="OSSclientConfig.basePath + scope.row.newValue" style="color:#409eff;">
                     {{$t('common:button:download')}}
                   </a>
-                  <a v-else-if="scope.row.DataType === 'Link' || scope.row.DataType === 'Router'" target="_blank" :href="scope.row.newValue">
+                  <a v-else-if="(scope.row.DataType === 'Link' || scope.row.DataType === 'Router') && scope.row.newValue && scope.row.newValue !== '--'" target="_blank" :href="scope.row.newValue" style="color:#409eff;">
                     {{$t('trials:auditRecord:title:viewDetail')}}
                   </a>
                    <viewer v-else-if="(scope.row.DataType === 'Image' || scope.row.DataType === 'ImageList') && scope.row.newValue && scope.row.newValue !== '--'" :ref="scope.row.newValue" :images="imagesList">
@@ -396,7 +397,7 @@
                 <viewer v-if="item.IsPicture" :images="imagesList" :ref="scope.row[item.ColumnValue]">
                   <!-- 查看图片 -->
                   <span style="color:#409eff;cursor: pointer"  @click="openImage(scope.row[item.ColumnValue])">{{$t('trials:auditRecord:title:viewImage')}}</span>
-                  <img :src="scope.row[item.ColumnValue]" v-show="false" crossorigin="anonymous" alt="">
+                  <img :src="OSSclientConfig.basePath + scope.row[item.ColumnValue]" v-show="false" crossorigin="anonymous" alt="">
                 </viewer>
                 <span v-else>{{scope.row[item.ColumnValue]}}</span>
               </template>
@@ -415,7 +416,7 @@
                       <span style="color:#409eff;cursor: pointer" @click="openImage(scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue])">
                         {{$t('trials:auditRecord:title:viewImage')}}
                       </span>
-                      <img :src="scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue]" v-show="false" crossorigin="anonymous" alt="">
+                      <img :src="OSSclientConfig.basePath + scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue]" v-show="false" crossorigin="anonymous" alt="">
                     </viewer>
                     <span v-else>{{scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue]}}</span>
                   </template>
@@ -619,6 +620,7 @@
             border
             style="width: 100%"
             size="small"
+            max-height="400"
           >
           <!-- 字段名 -->
             <el-table-column
@@ -644,10 +646,10 @@
               <template slot-scope="scope">
                  <span>
                   <!-- 查看详情 -->
-                   <a v-if="scope.row.DataType === 'OSS'" target="_blank" :href="OSSclientConfig.basePath + scope.row.oldValue">
+                   <a v-if="scope.row.DataType === 'OSS' && scope.row.oldValue && scope.row.oldValue !== '--'" target="_blank" :href="OSSclientConfig.basePath + scope.row.oldValue" style="color:#409eff;">
                     {{$t('common:button:download')}}
                   </a>
-                  <a v-else-if="scope.row.DataType === 'Link' || scope.row.DataType === 'Router'" target="_blank" :href="scope.row.oldValue">
+                  <a v-else-if="(scope.row.DataType === 'Link' || scope.row.DataType === 'Router') && scope.row.oldValue && scope.row.oldValue !== '--'" target="_blank" :href="scope.row.oldValue" style="color:#409eff;">
                     {{$t('trials:auditRecord:title:viewDetail')}}
                   </a>
                    <viewer v-else-if="(scope.row.DataType === 'Image' || scope.row.DataType === 'ImageList') && scope.row.oldValue && scope.row.oldValue !== '--'" :ref="scope.row.oldValue" :images="imagesList">
@@ -679,10 +681,10 @@
               <template slot-scope="scope">
                 <span :style="{ color: scope.row.newValue !== scope.row.oldValue ? '#f66' : null }">
                   <!-- 查看详情 -->
-                  <a v-if="scope.row.DataType === 'OSS'" target="_blank" :href="OSSclientConfig.basePath + scope.row.newValue">
+                  <a v-if="scope.row.DataType === 'OSS' && scope.row.newValue && scope.row.newValue !== '--'" target="_blank" :href="OSSclientConfig.basePath + scope.row.newValue" style="color:#409eff;">
                     {{$t('common:button:download')}}
                   </a>
-                  <a v-else-if="scope.row.DataType === 'Link' || scope.row.DataType === 'Router'" target="_blank" :href="scope.row.newValue">
+                  <a v-else-if="(scope.row.DataType === 'Link' || scope.row.DataType === 'Router') && scope.row.newValue && scope.row.newValue !== '--'" target="_blank" :href="scope.row.newValue" style="color:#409eff;">
                     {{$t('trials:auditRecord:title:viewDetail')}}
                   </a>
                    <viewer v-else-if="(scope.row.DataType === 'Image' || scope.row.DataType === 'ImageList') && scope.row.newValue && scope.row.newValue !== '--'" :ref="scope.row.newValue" :images="imagesList">
@@ -725,17 +727,27 @@
                 >
                   <template slot-scope="scope">
                     <!-- 查看图片 -->
-                    <span v-if="ite.IsPicture" @click="openImage(scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue])">
+                    <!-- <span v-if="ite.IsPicture" @click="openImage(scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue])">
                       {{$t('trials:auditRecord:title:viewImage')}}
-                    </span>
+                    </span> -->
+                    <viewer v-if="ite.IsPicture && ite.IsPicture !== '--'" :ref="scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue]" :images="imagesList">
+                    <!-- 查看图片 -->
+                     <span style="color:#409eff;cursor: pointer"  @click="openImage(scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue])">{{$t('trials:auditRecord:title:viewImage')}}</span>
+                     <img :src="OSSclientConfig.basePath + scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue]" v-show="false" crossorigin="anonymous" alt="">
+                   </viewer>
                     <span v-else>{{scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue]}}</span>
                   </template>
                 </el-table-column>
                 <template v-else slot-scope="scope">
                   <!-- 查看图片 -->
-                  <span v-if="item.IsPicture" @click="openImage(scope.row[item.ColumnValue])" :key="'ChildrenList' + index">
+                  <!-- <span v-if="item.IsPicture" @click="openImage(scope.row[item.ColumnValue])" :key="'ChildrenList' + index">
                     {{$t('trials:auditRecord:title:viewImage')}}
-                  </span>
+                  </span> -->
+                   <viewer v-if="item.IsPicture && item.IsPicture !== '--'" :ref="scope.row[item.ColumnValue]" :images="imagesList" :key="'ChildrenList' + index">
+                    <!-- 查看图片 -->
+                     <span style="color:#409eff;cursor: pointer"  @click="openImage(scope.row[item.ColumnValue])">{{$t('trials:auditRecord:title:viewImage')}}</span>
+                     <img :src="OSSclientConfig.basePath + scope.row[item.ColumnValue]" v-show="false" crossorigin="anonymous" alt="">
+                   </viewer>
                   <span v-else :key="'ChildrenList' + index">{{scope.row[item.ColumnValue]}}</span>
                 </template>
               </template>
@@ -1181,7 +1193,7 @@ export default {
         item.Enum = this.$i18n.locale === 'zh' ? v.ValueCN : v.Value
         this[auditData].push(item)
       })
-      console.log(this[auditData])
+      console.log(this[auditData],this.tableListData,this.tableList)
     },
     getJSON(row) {
       return new Promise(resolve => {