From 821475b7d68985650f33f3efe783f1cbc9e9076d Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 5 Mar 2025 09:51:33 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=BD=B1=E5=83=8F=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E3=80=81=E5=AD=97=E7=AC=A6=E9=9B=86=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/none-dicom-show/index.vue           |  6 +--
 .../visit/crc-upload/components/studyInfo.vue | 20 +++++++-
 .../components/uploadDicomFiles2.vue          | 51 +++++++++++++------
 .../components/uploadNonDicomFiles.vue        | 20 +++++++-
 .../visit/qc-check/components/dicomFiles.vue  | 18 +++++++
 .../qc-check/components/qualityAssurance.vue  | 47 +++++++++++++++--
 6 files changed, 138 insertions(+), 24 deletions(-)

diff --git a/src/views/none-dicom-show/index.vue b/src/views/none-dicom-show/index.vue
index a2355602..f861abf0 100644
--- a/src/views/none-dicom-show/index.vue
+++ b/src/views/none-dicom-show/index.vue
@@ -9,9 +9,9 @@
         <div v-for="(study, i) in studyList" :key="study.CodeView">
           <div class="study-desc">
             <span>{{ study.CodeView }}</span>
-            <span v-if="OtherInfo.IsShowStudyName" style="margin-left: 5px">{{
-              study.StudyName
-            }}</span>
+            <span v-if="OtherInfo.IsShowStudyName" style="margin-left: 5px">
+              {{ study.StudyName }}
+            </span>
             <span style="margin: 0 5px">{{ study.Modality }}</span>
             <span>{{ getBodyPart(study.BodyPart) }}</span>
           </div>
diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/studyInfo.vue b/src/views/trials/trials-panel/visit/crc-upload/components/studyInfo.vue
index f1a86870..bb571f80 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/studyInfo.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/studyInfo.vue
@@ -34,6 +34,7 @@
       height="300"
       :row-class-name="tableRowClassName"
       @selection-change="handleSelectionChange"
+      :default-sort="{ prop: 'UploadedTime', order: 'descending' }"
     >
       <el-table-column
         v-if="!(data.SubmitState * 1 === 2) || data.IsQCConfirmedReupload"
@@ -46,27 +47,32 @@
         :label="$t('trials:uploadedDicoms:table:studyId')"
         min-width="80"
         show-overflow-tooltip
+        sortable
       />
       <!-- 检查名称 -->
       <el-table-column
         v-if="relationInfo.IsShowStudyName"
         prop="StudyName"
         :label="$t('trials:audit:table:StudyName')"
+        sortable
       />
       <!-- 检查类型 -->
       <el-table-column
         prop="ModalityForEdit"
         :label="$t('trials:audit:table:modality')"
+        sortable
       />
       <!-- 检查类型 -->
       <el-table-column
         prop="Modalities"
         :label="$t('trials:audit:table:modality1')"
+        sortable
       />
       <!-- 检查部位 -->
       <el-table-column
         prop="BodyPartForEdit"
         :label="$t('trials:uploadedDicoms:table:bodyPart')"
+        sortable
         min-width="100"
         show-overflow-tooltip
       >
@@ -78,6 +84,7 @@
       <el-table-column
         prop="SeriesCount"
         :label="$t('trials:uploadedDicoms:table:seriesCount')"
+        sortable
         min-width="100"
         show-overflow-tooltip
       />
@@ -85,6 +92,7 @@
       <el-table-column
         prop="InstanceCount"
         :label="$t('trials:uploadedDicoms:table:instanceCount')"
+        sortable
         min-width="100"
         show-overflow-tooltip
       />
@@ -92,6 +100,7 @@
       <el-table-column
         prop="StudyTime"
         :label="$t('trials:uploadedDicoms:table:studyDate')"
+        sortable
         min-width="120"
         show-overflow-tooltip
       >
@@ -103,9 +112,18 @@
       <el-table-column
         prop="UploadedTime"
         :label="$t('trials:uploadedDicoms:table:uploadedTime')"
-        min-width="80"
+        sortable
+        min-width="120"
         show-overflow-tooltip
       />
+      <!-- 更新时间 -->
+      <el-table-column
+        prop="UpdateTime"
+        :label="$t('trials:uploadedDicoms:table:UpdateTime')"
+        min-width="120"
+        show-overflow-tooltip
+        sortable
+      />
       <el-table-column
         :label="$t('common:action:action')"
         min-width="100"
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 13185e03..ce457120 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
@@ -36,6 +36,7 @@
       :row-class-name="tableRowClassName"
       max-height="250"
       @selection-change="handleUploadedSelectionChange"
+      :default-sort="{ prop: 'UploadedTime', order: 'descending' }"
     >
       <el-table-column type="selection" width="55" />
       <!-- 检查编号 -->
@@ -44,6 +45,7 @@
         :label="$t('trials:uploadedDicoms:table:studyId')"
         min-width="80"
         show-overflow-tooltip
+        sortable
       >
         <template slot-scope="scope">
           <el-tooltip
@@ -92,16 +94,19 @@
         v-if="relationInfo.IsShowStudyName"
         prop="StudyName"
         :label="$t('trials:audit:table:StudyName')"
+        sortable
       />
       <!-- 检查类型 -->
       <el-table-column
         prop="ModalityForEdit"
         :label="$t('trials:audit:table:modality')"
+        sortable
       />
       <!-- 检查设备 -->
       <el-table-column
         prop="Modalities"
         :label="$t('trials:audit:table:modality1')"
+        sortable
       />
       <!-- 检查部位 -->
       <el-table-column
@@ -109,6 +114,7 @@
         :label="$t('trials:uploadedDicoms:table:bodyPart')"
         min-width="100"
         show-overflow-tooltip
+        sortable
       >
         <template slot-scope="scope">
           {{ getBodyPart(scope.row.BodyPartForEdit) }}
@@ -120,6 +126,7 @@
         :label="$t('trials:uploadedDicoms:table:seriesCount')"
         min-width="100"
         show-overflow-tooltip
+        sortable
       />
       <!-- 图像数量 -->
       <el-table-column
@@ -127,6 +134,7 @@
         :label="$t('trials:uploadedDicoms:table:instanceCount')"
         min-width="100"
         show-overflow-tooltip
+        sortable
       />
       <!-- 检查日期 -->
       <el-table-column
@@ -134,6 +142,7 @@
         :label="$t('trials:uploadedDicoms:table:studyDate')"
         min-width="120"
         show-overflow-tooltip
+        sortable
       >
         <template slot-scope="scope">
           {{
@@ -147,8 +156,17 @@
       <el-table-column
         prop="UploadedTime"
         :label="$t('trials:uploadedDicoms:table:uploadedTime')"
-        min-width="80"
+        min-width="120"
         show-overflow-tooltip
+        sortable
+      />
+      <!-- 更新时间 -->
+      <el-table-column
+        prop="UpdateTime"
+        :label="$t('trials:uploadedDicoms:table:UpdateTime')"
+        min-width="120"
+        show-overflow-tooltip
+        sortable
       />
       <el-table-column
         :label="$t('common:action:action')"
@@ -1171,8 +1189,12 @@ export default {
                 patientNameElement ? patientNameElement.dataOffset : 0,
                 patientNameElement ? patientNameElement.length : 0
               )
+              // 解析dicom中字符集字段与解析库不一致 2025.03.04
+              let SpecificCharacterSet = data.string('x00080005')
+                ? data.string('x00080005').replace('ISO IR', 'ISO_IR')
+                : ''
               const patientNameStr = convertBytes(
-                data.string('x00080005'),
+                SpecificCharacterSet,
                 patientNameBytes
               )
               scope.uploadQueues.push({
@@ -1280,8 +1302,11 @@ export default {
                   : 0,
                 seriesDescriptionElement ? seriesDescriptionElement.length : 0
               )
+              let SpecificCharacterSet = data.string('x00080005')
+                ? data.string('x00080005').replace('ISO IR', 'ISO_IR')
+                : ''
               const seriesDescriptionStr = convertBytes(
-                data.string('x00080005'),
+                SpecificCharacterSet,
                 seriesDescriptionBytes
               )
               seriesItem = {
@@ -1493,17 +1518,13 @@ export default {
                         ${li.join('')}
                         </ol>
                         </div>`
-            this.$alert(
-              content,
-              this.$t('trials:uploadDicomList:label:prompt'),
-              {
-                confirmButtonText: this.$t(
-                  'trials:uploadDicomList:label:confirm'
-                ),
-                dangerouslyUseHTMLString: true,
-                callback: (action) => {},
-              }
-            )
+            this.$alert(content, '', {
+              confirmButtonText: this.$t(
+                'trials:uploadDicomList:label:confirm'
+              ),
+              dangerouslyUseHTMLString: true,
+              callback: (action) => {},
+            })
             this.btnLoading = false
           }
           var results = []
@@ -1760,7 +1781,7 @@ export default {
                                     o.imageColumns,
                                     o.imageRows
                                   )
-                                  let thumbnailPath = `/${params.trialId}/Image/${params.trialSiteId}/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${v.seriesUid}.png`
+                                  let thumbnailPath = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${v.seriesUid}.png`
                                   let OSSclient = scope.OSSclient
                                   let seriesRes = await OSSclient.put(
                                     thumbnailPath,
diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue
index 57a1e608..486aecf7 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue
@@ -23,27 +23,35 @@
       </el-button>
     </div>
 
-    <el-table :data="nonDicomStudyList" style="width: 100%">
+    <el-table
+      :data="nonDicomStudyList"
+      style="width: 100%"
+      :default-sort="{ prop: 'CreateTime', order: 'descending' }"
+    >
       <!-- 检查编号 -->
       <el-table-column
         prop="CodeView"
         :label="$t('trials:uploadNonDicoms:table:studyId')"
+        sortable
       />
       <!-- 检查名称 -->
       <el-table-column
         v-if="relationInfo.IsShowStudyName"
         prop="StudyName"
         :label="$t('trials:uploadNonDicoms:table:StudyName')"
+        sortable
       />
       <!-- 检查类型 -->
       <el-table-column
         prop="Modality"
         :label="$t('trials:uploadNonDicoms:table:modality')"
+        sortable
       />
       <!-- 检查部位 -->
       <el-table-column
         prop="BodyPart"
         :label="$t('trials:uploadNonDicoms:table:bodyPart')"
+        sortable
       >
         <template slot-scope="scope">
           {{ getBodyPart(scope.row.BodyPart) }}
@@ -53,6 +61,7 @@
       <el-table-column
         prop="FileCount"
         :label="$t('trials:uploadNonDicoms:table:files')"
+        sortable
       >
         <template slot-scope="scope">
           <el-popover
@@ -165,6 +174,7 @@
       <el-table-column
         prop="ImageDate"
         :label="$t('trials:uploadNonDicoms:table:studyDate')"
+        sortable
       >
         <template slot-scope="scope">
           {{ moment(scope.row.ImageDate).format('YYYY-MM-DD') }}
@@ -174,6 +184,13 @@
       <el-table-column
         prop="UpdateTime"
         :label="$t('trials:uploadNonDicoms:table:updateTime')"
+        sortable
+      />
+      <!-- 创建时间 -->
+      <el-table-column
+        prop="CreateTime"
+        :label="$t('trials:uploadNonDicoms:table:CreateTime')"
+        sortable
       />
       <el-table-column :label="$t('common:action:action')" min-width="200">
         <template slot-scope="scope">
@@ -887,7 +904,6 @@ export default {
     // 扫描待上传文件
     beginScanFiles(e) {
       var files = [...e.target.files]
-      console.log(files)
       var sameFiles = []
       files.forEach((file) => {
         var extendName = file.name
diff --git a/src/views/trials/trials-panel/visit/qc-check/components/dicomFiles.vue b/src/views/trials/trials-panel/visit/qc-check/components/dicomFiles.vue
index 295c47f3..fc6542b7 100644
--- a/src/views/trials/trials-panel/visit/qc-check/components/dicomFiles.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/components/dicomFiles.vue
@@ -19,6 +19,7 @@
       height="300"
       :row-class-name="tableRowClassName"
       @selection-change="handleSelectionChange"
+      :default-sort="{ prop: 'UploadedTime', order: 'descending' }"
     >
       <!-- 检查编号 -->
       <el-table-column
@@ -26,6 +27,7 @@
         :label="$t('trials:audit:table:studyId')"
         min-width="80"
         show-overflow-tooltip
+        sortable
       />
       <!--      &lt;!&ndash; 检查类型 &ndash;&gt;-->
       <!--      <el-table-column-->
@@ -51,15 +53,18 @@
         v-if="relationInfo.IsShowStudyName"
         prop="StudyName"
         :label="$t('trials:audit:table:StudyName')"
+        sortable
       />
       <el-table-column
         prop="ModalityForEdit"
         :label="$t('trials:audit:table:modality')"
+        sortable
       />
       <!-- 检查类型 -->
       <el-table-column
         prop="Modalities"
         :label="$t('trials:audit:table:modality1')"
+        sortable
       />
       <!-- 检查部位 -->
       <el-table-column
@@ -67,6 +72,7 @@
         :label="$t('trials:uploadedDicoms:table:bodyPart')"
         min-width="100"
         show-overflow-tooltip
+        sortable
       >
         <template slot-scope="scope">
           {{ getBodyPart(scope.row.BodyPartForEdit) }}
@@ -78,6 +84,7 @@
         :label="$t('trials:audit:table:seriesCount')"
         min-width="100"
         show-overflow-tooltip
+        sortable
       />
       <!-- 图像数量 -->
       <el-table-column
@@ -85,6 +92,7 @@
         :label="$t('trials:audit:table:instanceCount')"
         min-width="100"
         show-overflow-tooltip
+        sortable
       />
       <!-- 检查日期 -->
       <el-table-column
@@ -92,6 +100,7 @@
         :label="$t('trials:audit:table:studyDate')"
         min-width="120"
         show-overflow-tooltip
+        sortable
       >
         <template slot-scope="scope">
           {{ moment(scope.row.StudyTime).format('YYYY-MM-DD') }}
@@ -103,6 +112,15 @@
         :label="$t('trials:audit:table:studyUploadTime')"
         min-width="80"
         show-overflow-tooltip
+        sortable
+      />
+      <!-- 更新时间 -->
+      <el-table-column
+        prop="UpdateTime"
+        :label="$t('trials:audit:table:studyUpdateTime')"
+        min-width="80"
+        show-overflow-tooltip
+        sortable
       />
       <el-table-column
         :label="$t('common:action:action')"
diff --git a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
index 91940ffc..a14c983e 100644
--- a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
@@ -104,12 +104,14 @@
               <el-table-column
                 prop="StudyCode"
                 :label="$t('trials:audit:table:studyId')"
+                sortable
               />
               <!-- 检查名称 -->
               <el-table-column
                 prop="StudyName"
                 v-if="relationInfo.IsShowStudyName"
                 :label="$t('trials:audit:table:StudyName')"
+                sortable
               >
                 <template slot-scope="scope">
                   <el-tooltip
@@ -131,16 +133,19 @@
               <el-table-column
                 prop="ModalityForEdit"
                 :label="$t('trials:audit:table:modality')"
+                sortable
               />
               <!-- 检查类型 -->
               <el-table-column
                 prop="Modalities"
                 :label="$t('trials:audit:table:modality1')"
+                sortable
               />
               <!-- 检查部位 -->
               <el-table-column
                 prop="BodyPartForEdit"
                 :label="$t('trials:audit:table:bodyPart')"
+                sortable
               >
                 <template slot-scope="scope">
                   <el-tooltip
@@ -164,16 +169,19 @@
               <el-table-column
                 prop="SeriesCount"
                 :label="$t('trials:audit:table:seriesCount')"
+                sortable
               />
               <!-- 图像数量 -->
               <el-table-column
                 prop="InstanceCount"
                 :label="$t('trials:audit:table:instanceCount')"
+                sortable
               />
               <!-- 检查日期 -->
               <el-table-column
                 prop="StudyTime"
                 :label="$t('trials:audit:table:studyDate')"
+                sortable
               >
                 <template slot-scope="scope">
                   <el-tooltip
@@ -241,32 +249,41 @@
             </el-table>
             <!-- 序列信息 -->
             <h3>{{ $t('trials:audit:title:series') }}</h3>
-            <el-table :data="seriesList" :row-class-name="tableRowClassName">
+            <el-table
+              :data="seriesList"
+              :row-class-name="tableRowClassName"
+              :default-sort="{ prop: 'CreateTime', order: 'descending' }"
+            >
               <!-- 序列号 -->
               <el-table-column
                 prop="SeriesNumber"
                 :label="$t('trials:audit:table:seriesId')"
+                sortable
               />
               <!-- 检查编号 -->
               <el-table-column
                 prop="StudyCode"
                 :label="$t('trials:audit:table:seriesOfStudyId')"
+                sortable
               />
               <!-- 检查类型 -->
               <el-table-column
                 prop="Modality"
                 :label="$t('trials:audit:table:seriesModality')"
+                sortable
                 show-overflow-tooltip
               />
               <!-- 图像数量 -->
               <el-table-column
                 prop="InstanceCount"
                 :label="$t('trials:audit:table:seriesOfInstanceCount')"
+                sortable
               />
               <!-- 检查日期 -->
               <el-table-column
                 prop="SeriesTime"
                 :label="$t('trials:audit:table:seriesOfStudyDate')"
+                sortable
                 show-overflow-tooltip
               >
                 <template slot-scope="scope">
@@ -281,12 +298,21 @@
               <el-table-column
                 prop="CreateTime"
                 :label="$t('trials:audit:table:seriesOfUploadedDate')"
+                sortable
+                show-overflow-tooltip
+              />
+              <!-- 上传时间 -->
+              <el-table-column
+                prop="UpdateTime"
+                :label="$t('trials:audit:table:seriesOfUpdateTime')"
+                sortable
                 show-overflow-tooltip
               />
               <!-- 是否阅片 -->
               <el-table-column
                 prop="IsReading"
                 :label="$t('trials:audit:table:isReading')"
+                sortable
               >
                 <template slot-scope="scope">
                   <el-switch
@@ -302,6 +328,7 @@
               <el-table-column
                 prop="IsDeleted"
                 :label="$t('trials:audit:table:isDelete')"
+                sortable
               >
                 <template slot-scope="scope">
                   <el-switch
@@ -404,28 +431,33 @@
             <el-table
               :data="noneDicomStudyList"
               @selection-change="handleSelectionChangeNonedicom"
+              :default-sort="{ prop: 'CreateTime', order: 'descending' }"
             >
               <el-table-column type="selection" width="55"> </el-table-column>
               <!-- 检查编号 -->
               <el-table-column
                 prop="CodeView"
                 :label="$t('trials:audit:table:nonDicomsStudyId')"
+                sortable
               />
               <!-- 检查名称 -->
               <el-table-column
                 prop="StudyName"
                 v-if="relationInfo.IsShowStudyName"
                 :label="$t('trials:audit:table:StudyName')"
+                sortable
               />
               <!-- 检查类型 -->
               <el-table-column
                 prop="Modality"
                 :label="$t('trials:audit:table:nonDicomsModality')"
+                sortable
               />
               <!-- 检查部位 -->
               <el-table-column
                 prop="BodyPart"
                 :label="$t('trials:audit:table:nonDicomsBodypart')"
+                sortable
               >
                 <template slot-scope="scope">
                   {{ getBodyPart(scope.row.BodyPart) }}
@@ -435,6 +467,7 @@
               <el-table-column
                 prop="FileCount"
                 :label="$t('trials:audit:table:nonDicomsFileCount')"
+                sortable
               >
                 <template slot-scope="scope">
                   <el-popover
@@ -514,6 +547,7 @@
               <el-table-column
                 prop="ImageDate"
                 :label="$t('trials:audit:table:nonDicomsStudyDate')"
+                sortable
               >
                 <template slot-scope="scope">
                   <i
@@ -538,6 +572,13 @@
               <el-table-column
                 prop="UpdateTime"
                 :label="$t('trials:audit:table:nonDicomsUpdateTime')"
+                sortable
+              />
+              <!-- 创建时间 -->
+              <el-table-column
+                prop="CreateTime"
+                :label="$t('trials:audit:table:nonDicomsCreateTime')"
+                sortable
               />
               <el-table-column :label="$t('common:action:action')">
                 <template slot-scope="scope">
@@ -2628,11 +2669,11 @@ export default {
     margin-top: 10px;
     overflow-y: auto;
   }
-  /deep/ .delete-row {
+  ::v-deep .delete-row {
     text-decoration-line: line-through;
     color: #c0c4cc;
   }
-  /deep/ .el-card {
+  ::v-deep .el-card {
     padding: 10px;
   }
 }

From ba26476c529f9f82250feee1291d4964d36976c7 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 5 Mar 2025 09:56:51 +0800
Subject: [PATCH 2/2] =?UTF-8?q?pdf=E9=A2=84=E8=A7=88=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E7=BC=A9=E6=94=BE=E6=94=B9=E4=B8=BA100%?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/pdfjs/web/viewer.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/pdfjs/web/viewer.js b/static/pdfjs/web/viewer.js
index d87d8b4f..5315e3de 100644
--- a/static/pdfjs/web/viewer.js
+++ b/static/pdfjs/web/viewer.js
@@ -11758,7 +11758,7 @@ const DEFAULT_L10N_STRINGS = {
   rendering_error: "An error occurred while rendering the page.",
   page_scale_width: "Page Width",
   page_scale_fit: "Page Fit",
-  page_scale_auto: "Automatic Zoom",
+  page_scale_auto: "100%", //Automatic Zoom
   page_scale_actual: "Actual Size",
   page_scale_percent: "{{scale}}%",
   loading: "Loading…",