From 205b420074f383b8ecd24be6761cd83041c8894d Mon Sep 17 00:00:00 2001
From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com>
Date: Thu, 5 Sep 2024 09:09:13 +0800
Subject: [PATCH 1/2] 1

---
 src/api/load.js                               |  8 ++
 .../uploadDicomAndNonedicom/index.vue         | 18 +++-
 .../uploadDicomAndNonedicom/nonedicomFile.vue | 95 +++++++++++++++++++
 src/utils/stream.js                           | 12 +--
 4 files changed, 121 insertions(+), 12 deletions(-)

diff --git a/src/api/load.js b/src/api/load.js
index 3bc426ca..91981151 100644
--- a/src/api/load.js
+++ b/src/api/load.js
@@ -63,4 +63,12 @@ export function getIRReadingDownloadStudyInfo(data) {
         method: 'post',
         data
     })
+}
+// 获取ir阅片和任务非dicom上传列表
+export function getIRUploadTaskNoneDicomStudyList(data) {
+    return request({
+        url: '/DownloadAndUpload/getIRUploadTaskNoneDicomStudyList',
+        method: 'post',
+        data
+    })
 }
\ No newline at end of file
diff --git a/src/components/uploadDicomAndNonedicom/index.vue b/src/components/uploadDicomAndNonedicom/index.vue
index 58355b3a..c258168a 100644
--- a/src/components/uploadDicomAndNonedicom/index.vue
+++ b/src/components/uploadDicomAndNonedicom/index.vue
@@ -12,7 +12,11 @@
         <dicomFile />
       </el-tab-pane>
       <el-tab-pane label="非DICOM 影像">
-        <nonedicomFile />
+        <nonedicomFile
+          :SubjectId="SubjectId"
+          :SubjectCode="SubjectCode"
+          :Criterion="Criterion"
+        />
       </el-tab-pane>
     </el-tabs>
   </el-dialog>
@@ -29,10 +33,20 @@ export default {
       type: Boolean,
       default: false,
     },
-    visitId: {
+    SubjectId: {
       type: String,
       default: '',
     },
+    SubjectCode: {
+      type: String,
+      default: '',
+    },
+    Criterion: {
+      type: Object,
+      default: () => {
+        return {}
+      },
+    },
   },
   data() {
     return {
diff --git a/src/components/uploadDicomAndNonedicom/nonedicomFile.vue b/src/components/uploadDicomAndNonedicom/nonedicomFile.vue
index e69de29b..3bf44785 100644
--- a/src/components/uploadDicomAndNonedicom/nonedicomFile.vue
+++ b/src/components/uploadDicomAndNonedicom/nonedicomFile.vue
@@ -0,0 +1,95 @@
+<template>
+  <div class="nonedicomFile">
+    <div class="top">
+      <span>{{ $t('upload:nonedicom:title') }}</span>
+    </div>
+    <!--检查列表-->
+    <el-table
+      :data="list"
+      style="width: 100%"
+      v-adaptive="{ bottomOffset: 170 }"
+      :loading="loading"
+    >
+      <!--受试者-->
+      <el-table-column
+        prop="SubjectCode"
+        :label="$t('upload:nonedicom:table:subject')"
+      />
+      <!--任务名称-->
+      <el-table-column
+        prop="TaskBlindName"
+        :label="$t('upload:nonedicom:table:taskName')"
+      />
+      <!--检查类型-->
+      <el-table-column
+        prop="OrginalStudyList"
+        :label="$t('upload:nonedicom:table:molityType')"
+      >
+      </el-table-column>
+      <!--检查部位-->
+      <el-table-column
+        prop="TaskBlindName"
+        :label="$t('upload:nonedicom:table:bodyPart')"
+      />
+      <!--原文件数-->
+      <el-table-column
+        prop="TaskBlindName"
+        :label="$t('upload:nonedicom:table:fileCount')"
+      />
+      <!--后处理文件数-->
+      <el-table-column
+        prop="TaskBlindName"
+        :label="$t('upload:dicom:table:uploadFileCount')"
+      />
+      <el-table-column
+        :label="$t('common:action:action')"
+        fixed="right"
+        width="140"
+      >
+        <template slot-scope="scope">
+          <!--预览--->
+          <el-button
+            v-if="isUpload"
+            circle
+            icon="el-icon-delete"
+            :title="$t('upload:dicom:button:preview')"
+          />
+          <!--删除--->
+          <el-button
+            v-if="isUpload"
+            circle
+            icon="el-icon-delete"
+            :title="$t('upload:dicom:button:delete')"
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import { getIRUploadTaskNoneDicomStudyList } from '@/api/load.js'
+export default {
+  name: 'nonedicomFile',
+  props: {
+    SubjectId: {
+      type: String,
+      default: '',
+    },
+    SubjectCode: {
+      type: String,
+      default: '',
+    },
+    Criterion: {
+      type: Object,
+      default: () => {
+        return {}
+      },
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+.top {
+  margin: 10px 0;
+}
+</style>
\ No newline at end of file
diff --git a/src/utils/stream.js b/src/utils/stream.js
index de27a281..eef180e7 100644
--- a/src/utils/stream.js
+++ b/src/utils/stream.js
@@ -17,11 +17,7 @@ function zipFiles(zipName, files) {
             } else {
                 let { name, url } = fileInfo.value;
                 url = decodeUtf8(url);
-                return fetch(url, {
-                    headers: {
-                        'Cross-Origin-Embedder-Policy': 'unsafe-none'
-                    }
-                }).then(res => {
+                return fetch(url).then(res => {
                     ctrl.enqueue({
                         name,
                         stream: () => res.body
@@ -46,11 +42,7 @@ async function updateFile(file, name) {
         store.dispatch('trials/setUnLock', true)
         const fileOutputStream = streamSaver.createWriteStream(name);
         file = decodeUtf8(file);
-        let res = await fetch(file, {
-            headers: {
-                'Cross-Origin-Embedder-Policy': 'unsafe-none'
-            }
-        });
+        let res = await fetch(file);
         res.body.pipeTo(fileOutputStream).then(() => {
             store.dispatch('trials/setUnLock', true)
         });

From e24b1cc722eea67b5d1a14716ae4181b9d4f44aa Mon Sep 17 00:00:00 2001
From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com>
Date: Thu, 5 Sep 2024 10:44:32 +0800
Subject: [PATCH 2/2] =?UTF-8?q?ir=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../downloadDicomAndNonedicom/index.vue       |   5 +
 .../uploadDicomAndNonedicom/index.vue         |  14 +-
 .../uploadDicomAndNonedicom/nonedicomFile.vue | 139 ++++++++++++++++--
 .../reading/reading-task/index.vue            |   3 +
 4 files changed, 145 insertions(+), 16 deletions(-)

diff --git a/src/components/downloadDicomAndNonedicom/index.vue b/src/components/downloadDicomAndNonedicom/index.vue
index 659c5c40..0564608d 100644
--- a/src/components/downloadDicomAndNonedicom/index.vue
+++ b/src/components/downloadDicomAndNonedicom/index.vue
@@ -44,6 +44,7 @@
       v-adaptive="{ bottomOffset: 85 }"
       height="100"
       :data="list"
+      :loading="loading"
       class="dicomFiles-table"
       @sort-change="handleSortByColumn"
       :default-sort="{ prop: 'TaskBlindName', order: 'descending' }"
@@ -185,6 +186,7 @@ export default {
   data() {
     return {
       title: null,
+      loading: false,
       list: [],
       searchData: defaultSearchData(),
       btnLoading: false,
@@ -220,13 +222,16 @@ export default {
         this.searchData.TrialReadingCriterionId =
           this.Criterion.TrialReadingCriterionId
         this.searchData.SubjectCode = this.SubjectCode
+        this.loading = true
         let res = await getSubjectImageDownloadSelectList(this.searchData)
+        this.loading = false
         if (res.IsSuccess) {
           this.list = res.Result
           this.hasDicom = this.list.some((item) => item.IsDicom)
           this.hasNonedicom = this.list.some((item) => !item.IsDicom)
         }
       } catch (err) {
+        this.loading = false
         console.log(err)
       }
     },
diff --git a/src/components/uploadDicomAndNonedicom/index.vue b/src/components/uploadDicomAndNonedicom/index.vue
index c258168a..67bad8bc 100644
--- a/src/components/uploadDicomAndNonedicom/index.vue
+++ b/src/components/uploadDicomAndNonedicom/index.vue
@@ -7,12 +7,19 @@
     class="uploadDicomAndNonedicom"
   >
     <span slot="title">{{ title }}</span>
-    <el-tabs type="border-card">
-      <el-tab-pane label="DICOM 影像">
+    <el-tabs type="border-card" v-model="activeName">
+      <el-tab-pane
+        :label="$t('uploadDicomAndNonedicom:label:dicom')"
+        name="dicom"
+      >
         <dicomFile />
       </el-tab-pane>
-      <el-tab-pane label="非DICOM 影像">
+      <el-tab-pane
+        :label="$t('uploadDicomAndNonedicom:label:nonedicom')"
+        name="nonedicom"
+      >
         <nonedicomFile
+          v-if="activeName === 'nonedicom'"
           :SubjectId="SubjectId"
           :SubjectCode="SubjectCode"
           :Criterion="Criterion"
@@ -51,6 +58,7 @@ export default {
   data() {
     return {
       title: 'Upload Images：01 > 01001 >Timepoint',
+      activeName: 'dicom',
     }
   },
   methods: {
diff --git a/src/components/uploadDicomAndNonedicom/nonedicomFile.vue b/src/components/uploadDicomAndNonedicom/nonedicomFile.vue
index 3bf44785..7b2e343c 100644
--- a/src/components/uploadDicomAndNonedicom/nonedicomFile.vue
+++ b/src/components/uploadDicomAndNonedicom/nonedicomFile.vue
@@ -7,7 +7,7 @@
     <el-table
       :data="list"
       style="width: 100%"
-      v-adaptive="{ bottomOffset: 170 }"
+      v-adaptive="{ bottomOffset: 40 }"
       :loading="loading"
     >
       <!--受试者-->
@@ -22,52 +22,128 @@
       />
       <!--检查类型-->
       <el-table-column
-        prop="OrginalStudyList"
+        prop="Modality"
         :label="$t('upload:nonedicom:table:molityType')"
       >
       </el-table-column>
       <!--检查部位-->
       <el-table-column
-        prop="TaskBlindName"
+        prop="BodyPart"
         :label="$t('upload:nonedicom:table:bodyPart')"
       />
       <!--原文件数-->
       <el-table-column
-        prop="TaskBlindName"
+        prop="FileCount"
         :label="$t('upload:nonedicom:table:fileCount')"
-      />
+      >
+        <el-popover
+          v-if="scope.row.FileCount"
+          trigger="click"
+          placement="bottom"
+        >
+          <el-table
+            :data="scope.row.NoneDicomStudyFileList"
+            height="300"
+            size="small"
+          >
+            <!-- 文件名称 -->
+            <el-table-column
+              prop="FileName"
+              :label="$t('trials:audit:table:nonDicomsFileName')"
+              width="200"
+            />
+            <el-table-column :label="$t('common:action:action')" width="120">
+              <template slot-scope="files">
+                <!-- 预览 -->
+                <el-button
+                  type="text"
+                  :disabled="
+                    files.row.FileType && files.row.FileType.indexOf('zip') >= 0
+                  "
+                  @click.native.prevent="previewFile(files.row)"
+                >
+                  {{ $t('trials:audit:button:nonDicomsPreview') }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+          <div slot="reference" class="name-wrapper">
+            <el-button type="text">
+              {{ scope.row.FileCount }}
+            </el-button>
+          </div>
+        </el-popover>
+        <span v-else>{{ scope.row.FileCount }}</span>
+      </el-table-column>
       <!--后处理文件数-->
       <el-table-column
-        prop="TaskBlindName"
-        :label="$t('upload:dicom:table:uploadFileCount')"
+        prop="UploadedFileCount"
+        :label="$t('upload:nonedicom:table:uploadFileCount')"
       />
       <el-table-column
         :label="$t('common:action:action')"
         fixed="right"
-        width="140"
+        width="180"
       >
         <template slot-scope="scope">
           <!--预览--->
           <el-button
-            v-if="isUpload"
             circle
-            icon="el-icon-delete"
-            :title="$t('upload:dicom:button:preview')"
+            icon="el-icon-view"
+            :title="$t('upload:nonedicom:button:preview')"
+          />
+          <!--上传--->
+          <el-button
+            circle
+            icon="el-icon-upload2"
+            :title="$t('upload:nonedicom:button:upload')"
           />
           <!--删除--->
           <el-button
-            v-if="isUpload"
+            :disabled="scope.row.UploadedFileCount <= 0"
             circle
             icon="el-icon-delete"
-            :title="$t('upload:dicom:button:delete')"
+            :title="$t('upload:nonedicom:button:delete')"
           />
         </template>
       </el-table-column>
     </el-table>
+    <!-- 预览单个图像 -->
+    <el-dialog
+      v-if="imgObj.visible"
+      :visible.sync="imgObj.visible"
+      :title="$t('trials:uploadNonDicoms:dialogTitle:preview')"
+      append-to-body
+      width="565px"
+    >
+      <div
+        v-loading="imgObj.loading"
+        class="base-modal-body"
+        style="border: 2px solid #ccc; padding: 10px"
+      >
+        <el-image
+          :src="`${OSSclientConfig.basePath}${imgObj.url}`"
+          crossorigin="anonymous"
+          fit="fit"
+          style="height: 500px; width: 500px"
+          @error="imgObj.loading = false"
+          @load="imgObj.loading = false"
+        />
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
 import { getIRUploadTaskNoneDicomStudyList } from '@/api/load.js'
+let defaultSearchData = () => {
+  return {
+    SubjectId: null,
+    TrialReadingCriterionId: null,
+    SubjectCode: null,
+    Asc: false,
+    SortField: 'TaskBlindName',
+  }
+}
 export default {
   name: 'nonedicomFile',
   props: {
@@ -86,6 +162,43 @@ export default {
       },
     },
   },
+  data() {
+    return {
+      loading: false,
+      list: [],
+      searchData: defaultSearchData(),
+      imgObj: { url: '', visible: false, loading: false },
+    }
+  },
+  mounted() {
+    this.getList()
+  },
+  methods: {
+    async getList() {
+      try {
+        this.searchData.SubjectId = this.SubjectId
+        this.searchData.TrialReadingCriterionId =
+          this.Criterion.TrialReadingCriterionId
+        this.searchData.SubjectCode = this.SubjectCode
+        this.loading = true
+        let res = await getIRUploadTaskNoneDicomStudyList(this.searchData)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.list = res.Result
+        }
+      } catch (err) {
+        this.loading = false
+        console.log(err)
+      }
+    },
+    // 预览文件
+    previewFile(row) {
+      // window.open(row.FullFilePath, '_blank')
+      this.imgObj.url = row.FullFilePath
+      this.imgObj.loading = true
+      this.imgObj.visible = true
+    },
+  },
 }
 </script>
 <style lang="scss" scoped>
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 f3564d0e..1685355e 100644
--- a/src/views/trials/trials-panel/reading/reading-task/index.vue
+++ b/src/views/trials/trials-panel/reading/reading-task/index.vue
@@ -271,6 +271,9 @@
     /> -->
     <upload-dicom-and-nonedicom
       v-if="uploadImageVisible"
+      :SubjectId="uploadSubjectId"
+      :SubjectCode="uploadSubjectCode"
+      :Criterion="uploadTrialCriterion"
       :visible.sync="uploadImageVisible"
     />
     <download-dicom-and-nonedicom