Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main

public/error.html

@@ -66,7 +66,7 @@
               IRC Imaging System
             </p>
             <p style="margin-bottom: 20px">
-              V1.2.0.001
+              V1.3.0.001
             </p>
             <p style="margin-bottom: 20px">
               Copyright © {{ new Date().getFullYear() }} 上海展影医疗科技有限公司 版权所有

src/utils/request.js

@@ -46,10 +46,13 @@ service.interceptors.request.use(
   }
 )
 
+var isConfirm = true
+
 service.interceptors.response.use(
   response => {
     const res = response.data
     if (res.IsSuccess) {
+      isConfirm = true
       return Promise.resolve(res)
     } else if (res.IsSuccess === false) {
       if (res.Code !== 5) {
@@ -115,7 +118,7 @@ service.interceptors.response.use(
           })
         }
       } else {
-        if(message !== ''){
+        if(message !== '' && isConfirm){
           MessageBox.confirm(message, store.state.lang.language === 'en'? 'Warning' : '警告', {
             type: 'warning',
             showCancelButton: false,
@@ -124,12 +127,13 @@ service.interceptors.response.use(
         }
       }
     }
-    if (!window.navigator.onLine) {
+    if (!window.navigator.onLine && isConfirm) {
-      MessageBox.confirm(store.state.lang.language === 'en'? 'Please check your network, refresh the page later to try again！' : '请检查您的网络,稍后刷新页面重试！', store.state.lang.language === 'en'? 'Warning' : '警告', {
+      MessageBox.confirm(store.state.lang.language === 'en'? 'Please check your network，and try again later！' : '请检查网络，稍后重试！', store.state.lang.language === 'en'? 'Warning' : '警告', {
         type: 'warning',
         showCancelButton: false,
         callback: action => {}
       })
+      isConfirm = false
     }
     return Promise.reject(new Error(message || 'Error'))
   }

src/views/login/index.vue

@@ -124,7 +124,7 @@
           IRC Imaging System
         </p>
         <p style="margin-bottom: 20px">
-          V1.2.0.001
+          V1.3.0.001
         </p>
         <p style="margin-bottom: 20px" v-if="language === 'zh'">
           Copyright © {{ new Date().getFullYear() }} 上海展影医疗科技有限公司 版权所有

src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue

@@ -44,7 +44,17 @@
         show-overflow-tooltip
       >
         <template slot-scope="scope">
-          <el-tooltip placement="top">
+          <el-tooltip placement="top" v-if="(() => {
+            var r = false
+            if (scope.row.IsHaveUploadFailed) {
+              uploadQueues.forEach((v) => {
+                if (v.dicomInfo.studyUid === scope.row.StudyInstanceUid && v.uploadState.record && v.uploadState.record.Failed.length){
+                  r = true
+                }
+              })
+            }
+            return r
+          })()">
             <div slot="content">
               {{ $t('trials:uploadDicomList:table:status4') }}
             </div>
@@ -133,16 +143,15 @@
             circle
             @click="handleDeleteStudy(scope.row)"
           />
-          <el-button
+<!--          <el-button-->
-            icon="el-icon-toilet-paper"
+<!--            icon="el-icon-toilet-paper"-->
-            circle
+<!--            circle-->
-            :title="$t('trials:uploadDicomFiles:button:historical')"
+<!--            :title="$t('trials:uploadDicomFiles:button:historical')"-->
-            @click="handleHistorical(scope.row)"
+<!--            @click="handleHistorical(scope.row)"-->
-          />
+<!--          />-->
         </template>
       </el-table-column>
     </el-table>
-
     <!-- 多文件上传 -->
     <form id="inputForm" ref="uploadForm" enctype="multipart/form-data">
       <el-divider content-position="left">{{ $t('trials:uploadedDicoms:title:dicomFilesOnly') }}</el-divider>
@@ -1140,7 +1149,7 @@ export default {
                         Record.Existed.push(name)
                         Record.FileCount++
                       } else {
-                        let path = `/${params.trialId}/Image/${params.siteId}/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${v.seriesUid}/${o.instanceUid}/${scope.getGuid(dicomInfo.studyUid + v.seriesUid + o.instanceUid + params.trialId)}`
+                        let path = `/${params.trialId}/Image/${params.siteId}/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${scope.getGuid(dicomInfo.studyUid + v.seriesUid + o.instanceUid + params.trialId)}`
                         let res = await dcmUpload(path, o.file, config)
                         if (!res || !res.url) {
                           params.failedFileCount++
@@ -1151,7 +1160,7 @@ export default {
                                 o.file
                               )
                               let blob = await scope.dicomToPng(fileId, o.imageColumns, o.imageRows)
-                              let thumbnailPath = `/${params.trialId}/Image/${params.siteId}/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${v.seriesUid}/${v.seriesUid}.png`
+                              let thumbnailPath = `/${params.trialId}/Image/${params.siteId}/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${v.seriesUid}.png`
                               let OSSclient = scope.OSSclient
                               let seriesRes = await OSSclient.put(thumbnailPath, blob)
                               if (seriesRes && seriesRes.url) {
@@ -1237,7 +1246,7 @@ export default {
                   v.instanceList[0].file
                 )
                 let blob = await scope.dicomToPng(fileId, v.instanceList[0].imageColumns, v.instanceList[0].imageRows)
-                let thumbnailPath = `/${params.trialId}/Image/${params.siteId}/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${v.seriesUid}/${v.seriesUid}.png`
+                let thumbnailPath = `/${params.trialId}/Image/${params.siteId}/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${v.seriesUid}.png`
                 let OSSclient = scope.OSSclient
                 let seriesRes = await OSSclient.put(thumbnailPath, blob)
                 if (seriesRes && seriesRes.url) {

src/views/trials/trials-panel/visit/crc-upload/index.vue

@@ -180,12 +180,6 @@
           min-width="120"
         >
           <template slot-scope="scope">
-            <el-tooltip placement="top" v-key="scope.row.Id" v-if="scope.row.IsHaveUploadFailed">
-              <div slot="content">
-                {{ $t('trials:uploadDicomList:table:status4') }}
-              </div>
-              <span class="el-icon-warning" style="color: #cbb024;cursor: pointer"></span>
-            </el-tooltip>
             <span style="margin: 0 4px">{{ scope.row.SubjectCode }}</span>
             <!-- 基 -->
             <span v-if="scope.row.SubjectFirstGiveMedicineTime" class="status-primary-circle">
@@ -1428,8 +1422,7 @@ export default {
         if (res.IsSuccess) {
           let text = this.$t('trials:crcUpload:message:submit')
           if (this.rowData.IsHaveUploadFailed) {
-            text = `<div>${this.$t('trials:crcUpload:message:submit')}</div>` +
+            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,

src/views/trials/trials-workbench/components/clinicalDataConfirm.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="wrapper">
     <el-row>
-      <el-col :span="8">
+      <el-col :span="10">
         <h3>{{$t('trials:audit:tab:clinicalDataconfirm')}}</h3>
       </el-col>
-      <el-col :span="16" style="text-align:right;">
+      <el-col :span="14" style="text-align:right;">
         <h3>
           <Pagination class="page" :total="total" :page.sync="listQuery.pageIndex" :limit.sync="listQuery.pageSize" layout="total, sizes, prev, pager, next" :background="false" style="display: inline-block;" @pagination="getList" />
           <!-- 重置 -->