From aa91999ef840c9a27eb39b9bf1983f8b9312e47b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Fri, 19 Jan 2024 16:50:40 +0800
Subject: [PATCH] =?UTF-8?q?admin=E9=98=85=E7=89=87=E4=BA=BA=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.usa                                      |  2 +-
 .../reviewers/components/GcpCertificate.vue   | 37 +++++++++++++------
 .../components/uploadDicomFiles2.vue          | 12 +++++-
 .../trials-panel/visit/crc-upload/index.vue   | 17 +++++++--
 4 files changed, 51 insertions(+), 17 deletions(-)

diff --git a/.env.usa b/.env.usa
index 00362598..2934e616 100644
--- a/.env.usa
+++ b/.env.usa
@@ -2,7 +2,7 @@
 ENV = 'production'
 NODE_ENV = 'production'
 # base public path
-VUE_APP_BASE_PATH = '/'
+VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-01-19/'
 
 # 是否开启登陆限制 true:是 false:否
 VUE_APP_LOGIN_FOR_PERMISSION = false
diff --git a/src/views/reviewers/components/GcpCertificate.vue b/src/views/reviewers/components/GcpCertificate.vue
index 597f6014..933046c8 100644
--- a/src/views/reviewers/components/GcpCertificate.vue
+++ b/src/views/reviewers/components/GcpCertificate.vue
@@ -5,6 +5,7 @@
       <el-radio :label="0">No</el-radio>
     </el-radio-group>
     <div v-if="GCP" class="upload-container">
+<!--      <upload-file :doctor-id="doctorId" type="GCP" />-->
       <el-upload
         class="upload-demo"
         action
@@ -30,10 +31,14 @@
   </div>
 </template>
 <script>
+import UploadFile from '@/components/UploadFile'
 import { uploadFile, deleteAttachment, getAttachmentByType, saveAttachments } from '@/api/attachment'
 import { updateGcpExperience } from '@/api/reviewers'
 export default {
-  name: 'UploadFile',
+  name: 'GcpCertificate',
+  components: {
+    UploadFile
+  },
   props: {
     doctorId: {
       type: String,
@@ -116,20 +121,28 @@ export default {
       })
       return arr
     },
-    uploadFile(param) {
+    async uploadFile(param) {
       var fileName = param.file.name
       this.btnDisabled = true
-      uploadFile(param.file, 'GCP', this.doctorId)
-        .then(res => {
-          if (res.IsSuccess) {
-            this.fileList.push({ name: fileName, path: res.Result.FilePath, fullPath: res.Result.FullFilePath, type: 'GCP' })
-            this.saveFile()
-          }
-        })
-        .catch(() => {
-          this.btnDisabled = false
-        })
+      const file = await this.fileToBlob(param.file)
+      const res = await this.OSSclient.put(`/SystemData/reviewer/GCP/${this.doctorId}/${fileName}`, file)
+      this.fileList.push({ name: fileName, path: this.$getObjectName(res.url), fullPath: this.$getObjectName(res.url),url: this.$getObjectName(res.url), type: 'GCP' })
+      this.saveFile()
     },
+    // uploadFile(param) {
+    //   var fileName = param.file.name
+    //   this.btnDisabled = true
+    //   uploadFile(param.file, 'GCP', this.doctorId)
+    //     .then(res => {
+    //       if (res.IsSuccess) {
+    //         this.fileList.push({ name: fileName, path: res.Result.FilePath, fullPath: res.Result.FullFilePath, type: 'GCP' })
+    //         this.saveFile()
+    //       }
+    //     })
+    //     .catch(() => {
+    //       this.btnDisabled = false
+    //     })
+    // },
     saveFile() {
       const { name, path, fullPath, type } = this.fileList[0]
       const param = [{ DoctorId: this.doctorId, Type: type, Path: path, FullPath: fullPath, FileName: name }]
diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
index 2682c576..38f4972d 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
@@ -42,7 +42,17 @@
         :label="$t('trials:uploadedDicoms:table:studyId')"
         min-width="80"
         show-overflow-tooltip
-      />
+      >
+        <template slot-scope="scope">
+          <el-tooltip placement="top">
+            <div slot="content">
+              {{ $t('trials:uploadDicomList:table:status4') }}
+            </div>
+            <span class="el-icon-warning" style="color: #cbb024;cursor: pointer" v-if="scope.row.IsHaveUploadFailed"></span>
+          </el-tooltip>
+          {{scope.row.StudyCode}}
+        </template>
+      </el-table-column>
       <!-- 检查类型 -->
       <el-table-column
         prop="ModalityForEdit"
diff --git a/src/views/trials/trials-panel/visit/crc-upload/index.vue b/src/views/trials/trials-panel/visit/crc-upload/index.vue
index 74abec17..deb2e555 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/index.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/index.vue
@@ -180,8 +180,13 @@
           min-width="120"
         >
           <template slot-scope="scope">
-
-            <span>{{ scope.row.SubjectCode }}</span>
+            <el-tooltip placement="top">
+              <div slot="content">
+                {{ $t('trials:uploadDicomList:table:status4') }}
+              </div>
+              <span class="el-icon-warning" style="color: #cbb024;cursor: pointer" v-if="scope.row.IsHaveUploadFailed"></span>
+            </el-tooltip>
+            <span style="margin: 0 4px">{{ scope.row.SubjectCode }}</span>
             <!-- 基 -->
             <span v-if="scope.row.SubjectFirstGiveMedicineTime" class="status-primary-circle">
               {{ $t('trials:crcUpload:label:firstGiveMedicineTime') }}
@@ -1421,7 +1426,13 @@ export default {
       verifyCRCRequestToQC(param).then(res => {
         this.loading = false
         if (res.IsSuccess) {
-          this.$confirm(this.$t('trials:crcUpload:message:submit'), {
+          let text = this.$t('trials:crcUpload:message:submit')
+          if (this.rowData.IsHaveUploadFailed) {
+            text = `<div>${this.$t('trials:crcUpload:message:submit')}</div>` +
+                   `<div style="font-size: 12px;color:#f66;margin-top: 5px;"><span class="el-icon-warning"></span>${this.$t('trials:crcUpload:message:submitNote')}</div>`
+          }
+          this.$confirm(text, {
+            dangerouslyUseHTMLString: true ,
             type: 'warning',
             distinguishCancelAndClose: true
           })