From b43c75dd9fd8d0f90706a30295aaa6ea383f446a Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 3 Mar 2026 16:50:02 +0800
Subject: [PATCH 1/8] =?UTF-8?q?oct=E8=A1=A8=E6=A0=BC=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/OCT/QuestionList.vue            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
index 6d93ac2c..2ccbc36c 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
@@ -67,13 +67,13 @@
                         </span>
                       </template>
                     </el-table-column>
-                    <el-table-column v-if="readingTaskState < 2" :label="$t('common:action:action')" width="90px"
+                    <el-table-column v-if="readingTaskState < 2 && item.LesionType === 104" :label="$t('common:action:action')" width="90px"
                       fixed="right">
                       <template slot-scope="scope">
                         <el-button type="text" size="mini" @click="handleAddOrEdit('edit', item, scope.$index)">
                           {{ $t('common:button:edit') }}
                         </el-button>
-                        <el-button v-if="item.LesionType === 112 || item.LesionType === 111" type="text" size="mini"
+                        <el-button type="text" size="mini"
                           @click="handleDelete(item, scope.$index)">
                           {{ $t('common:button:delete') }}
                         </el-button>

From 1f51bbd17836be65aff4aa1cdf064853230ac816 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 4 Mar 2026 10:17:06 +0800
Subject: [PATCH 2/8] =?UTF-8?q?OCT=E5=AF=BC=E5=85=A5=E6=B5=8B=E9=87=8F?=
 =?UTF-8?q?=E5=80=BC=E8=8E=B7=E5=8F=96=E6=A8=A1=E6=9D=BF=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/IVUS/QuestionList.vue           | 2 +-
 .../reading/dicoms/components/OCT/QuestionList.vue            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
index 811b6f98..1050b4cd 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
@@ -802,7 +802,7 @@ export default {
     uploadTpl(lesionType, TableName) {
       this.upload.lesionType = lesionType
       this.upload.TableName = TableName
-      this.upload.title = `导入（ ${this.$fd('LesionType', lesionType)} ）`
+      this.upload.title = `${this.$fd('LesionType', lesionType)}`
       this.upload.visible = true
     },
     async downloadTpl() {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
index 2ccbc36c..edce5886 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
@@ -805,7 +805,7 @@ export default {
     uploadTpl(lesionType, TableName) {
       this.upload.lesionType = lesionType
       this.upload.TableName = TableName
-      this.upload.title = `导入（ ${this.$fd('LesionType', lesionType)} ）`
+      this.upload.title = `${this.$fd('LesionType', lesionType)}`
       this.upload.visible = true
     },
     async downloadTpl(lesionType) {
@@ -813,7 +813,7 @@ export default {
         const params = {
           visitTaskId: this.visitTaskId
         }
-        if (lesionType === 112) {
+        if (lesionType === 104) {
           await getOCTFCTTemplate(params)
         } else {
           await getOCTLipidAngleTemplate(params)

From fdb7251b62c4a09c8e53e7d51cbf39b061c3c4fd Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 4 Mar 2026 11:23:15 +0800
Subject: [PATCH 3/8] =?UTF-8?q?v2.0.0=E5=8F=91=E5=B8=83=E9=81=97=E7=95=99?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dictionary/template/browser/tip.vue |  6 ++--
 .../reading/dicoms/components/DicomViewer.vue | 26 ++++++++++++++++
 .../reading/dicoms3D/components/ReadPage.vue  | 26 ++++++++++++++++
 .../subject-list/components/SubjectChart.vue  |  1 +
 .../trial-summary/report-forms/index.vue      | 30 +++++++++++--------
 5 files changed, 74 insertions(+), 15 deletions(-)

diff --git a/src/views/dictionary/template/browser/tip.vue b/src/views/dictionary/template/browser/tip.vue
index 391ea8ec..3bd08331 100644
--- a/src/views/dictionary/template/browser/tip.vue
+++ b/src/views/dictionary/template/browser/tip.vue
@@ -37,7 +37,7 @@ export default {
         // console.log(type, No);
         if (type !== "Chrome" && type !== "Edge") {
           this.tip = this.$t("browser:tip:changeBorwser");
-          this.getSystemInfo()
+          // this.getSystemInfo()
           return (this.visible = true);
         }
         let res = await this.getInfo();
@@ -53,10 +53,10 @@ export default {
               this.tip += "、";
             }
           });
-          this.getSystemInfo()
+          // this.getSystemInfo()
           return (this.visible = true);
         }
-        this.getSystemInfo()
+        // this.getSystemInfo()
       } catch (err) {
         console.log(err);
       }
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
index 7c5148cd..d2bf4552 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
@@ -704,6 +704,7 @@ import { getAutoCutNextTask } from '@/api/user'
 import const_ from '@/const/sign-code'
 import { changeURLStatic } from '@/utils/history.js'
 import SystemInfo from "@/utils/systemInfo";
+import md5 from 'js-md5'
 export default {
   name: 'DicomViewer',
   components: {
@@ -1138,6 +1139,7 @@ export default {
       let windowHeight = document.documentElement.clientHeight;
       this.AspectRatio = windowWidth / windowHeight
     };
+    this.getSystemInfoReading()
   },
   beforeDestroy() {
     DicomEvent.$off('updateImage')
@@ -2501,6 +2503,30 @@ export default {
 
       })
     },
+    async getSystemInfoReading() {
+      return new Promise(async resolve => {
+        let whitelisting = localStorage.getItem('whitelisting') ? JSON.parse(localStorage.getItem('whitelisting')) : []
+        let user = md5(sessionStorage.getItem('identityUserId'))
+        let r = whitelisting.some(item => item === user)
+        if (r) return resolve(true)
+        const systemInfo = new SystemInfo();
+        const allInfo = systemInfo.getAllInfo();
+        let deviceMemory = allInfo.hardware.deviceMemory; // 设备内存
+        let { width, height } = allInfo.screen; // 分辨率
+        // let discrete = allInfo.webgl.gpuType.discrete; // 是否独立显卡
+        // let estimatedMemory = allInfo.webgl.memoryInfo.estimatedMemory; // 显卡内存
+        // parseFloat(deviceMemory) < 16 || 
+        if (width < 1920 || height < 1080) {
+          let res = await this.$confirm(this.$t('browser:tip:Configuration'))
+          whitelisting.push(user)
+          localStorage.setItem('whitelisting', JSON.stringify(whitelisting))
+          resolve(res)
+        } else {
+          resolve(true)
+        }
+      })
+
+    },
   }
 }
 </script>
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
index 9c0f7591..cb66523b 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
@@ -500,6 +500,7 @@ import downloadDicomAndNonedicom from '@/components/downloadDicomAndNonedicom'
 import { getNetWorkSpeed, setNetWorkSpeedSizeAll, workSpeedclose } from "@/utils"
 import readingChart from '@/components/readingChart'
 import SystemInfo from "@/utils/systemInfo";
+import md5 from 'js-md5'
 const { visibility } = annotation
 const { ViewportType, Events } = Enums
 const renderingEngineId = 'myRenderingEngine'
@@ -812,6 +813,7 @@ export default {
       this.open.postMessage({ type: 'addNoneDicomMeasureData', data: data }, window.location)
     })
     document.addEventListener("click", this.foo);
+    this.getSystemInfoReading();
   },
   methods: {
     setMPRInfo(obj) {
@@ -3567,6 +3569,30 @@ export default {
 
       })
     },
+    async getSystemInfoReading() {
+      return new Promise(async resolve => {
+        let whitelisting = localStorage.getItem('whitelisting') ? JSON.parse(localStorage.getItem('whitelisting')) : []
+        let user = md5(sessionStorage.getItem('identityUserId'))
+        let r = whitelisting.some(item => item === user)
+        if (r) return resolve(true)
+        const systemInfo = new SystemInfo();
+        const allInfo = systemInfo.getAllInfo();
+        let deviceMemory = allInfo.hardware.deviceMemory; // 设备内存
+        let { width, height } = allInfo.screen; // 分辨率
+        // let discrete = allInfo.webgl.gpuType.discrete; // 是否独立显卡
+        // let estimatedMemory = allInfo.webgl.memoryInfo.estimatedMemory; // 显卡内存
+        // parseFloat(deviceMemory) < 16 || 
+        if (width < 1920 || height < 1080) {
+          let res = await this.$confirm(this.$t('browser:tip:Configuration'))
+          whitelisting.push(user)
+          localStorage.setItem('whitelisting', JSON.stringify(whitelisting))
+          resolve(res)
+        } else {
+          resolve(true)
+        }
+      })
+
+    },
   },
   beforeDestroy() {
     DicomEvent.$off('isCanActiveNoneDicomTool')
diff --git a/src/views/trials/trials-panel/subject/subject-list/components/SubjectChart.vue b/src/views/trials/trials-panel/subject/subject-list/components/SubjectChart.vue
index 1886d1b1..6c25eff7 100644
--- a/src/views/trials/trials-panel/subject/subject-list/components/SubjectChart.vue
+++ b/src/views/trials/trials-panel/subject/subject-list/components/SubjectChart.vue
@@ -92,6 +92,7 @@ export default {
             this.loading = true
             getTrialCriterionList(this.$route.query.trialId, false).then(res => {
                 this.trialCriterionList = res.Result.filter(item => [1, 18, 2, 3, 7, 10, 17].includes(Number(item.CriterionType)))
+                this.loading = false
                 if (this.trialCriterionList.length > 0) {
                     this.TrialReadingCriterionId = this.trialCriterionList[0].TrialReadingCriterionId
                     this.getList()
diff --git a/src/views/trials/trials-panel/trial-summary/report-forms/index.vue b/src/views/trials/trials-panel/trial-summary/report-forms/index.vue
index b9188783..925896f7 100644
--- a/src/views/trials/trials-panel/trial-summary/report-forms/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/report-forms/index.vue
@@ -145,23 +145,29 @@ export default {
                         titleText: this.$t("trials:reportForms:cjart:title:VisitFinishedStat"),
                         seriesData: [],
                         max: 0,
-                        legendData: [
-                            this.$t("trials:reportForms:cjart:title:UploadedCount"),
-                            this.$t("trials:reportForms:cjart:title:QCFinishedCount"),
-                            this.$t("trials:reportForms:cjart:title:CheckFinishedCount"),
-                            this.$t("trials:reportForms:cjart:title:ReadingFinishedCount")
-                        ]
+                        legendData: []
                     }
                     res.Result.ReadingFinishedCount = res.Result.CriterionList[0].ReadingFinishedCount
                     let keys = ['UploadedCount', 'QCFinishedCount', 'CheckFinishedCount', 'ReadingFinishedCount']
-                    obj.legendData.forEach((item, index) => {
-                        let o = {
-                            name: item,
-                            value: res.Result[keys[index]]
+                    keys.forEach((item, index) => {
+                        if (res.Result[item] != null) {
+                            let o = {
+                                name: this.$t(`trials:reportForms:cjart:title:${item}`),
+                                value: res.Result[item]
+                            }
+                            obj.legendData.push(o.name)
+                            obj.seriesData.push(o)
+                            arr.push(res.Result[item])
                         }
-                        obj.seriesData.push(o)
-                        arr.push(res.Result[keys[index]])
                     })
+                    // obj.legendData.forEach((item, index) => {
+                    //     let o = {
+                    //         name: item,
+                    //         value: res.Result[keys[index]]
+                    //     }
+                    //     obj.seriesData.push(o)
+                    //     arr.push(res.Result[keys[index]])
+                    // })
                     obj.max = Math.max(...arr)
                     this.initChart_left(obj)
                 }

From da252ae4df7f22791f09e4506aef5fd4c7aa5fa0 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 4 Mar 2026 11:26:48 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E6=95=B0=E5=80=BC=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E7=AD=94=E6=A1=88=E4=B8=BANE=E4=BF=9D=E5=AD=98bug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/IVUS/QuestionList.vue   | 11 ++++++++---
 .../reading/dicoms/components/OCT/QuestionList.vue    | 10 ++++++++--
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
index 1050b4cd..5f9f2d02 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
@@ -114,7 +114,7 @@
                             v-else
                             type="number" 
                             @change="(val) => { formItemChange(val, item) }" 
-                            @input="(val) => questionForm[item.Id] = val.replace(/[^\d.]/g, '')"
+                            @input="numberInput(item.Id)"
                             @blur="handleBlur(questionForm[item.Id], questionForm, item)"
                             v-model.trim="questionForm[item.Id]" :disabled="readingTaskState === 2">
                             <template slot="append" v-if="item.Unit !== 0">{{ item.Unit !== 4 ? $fd('ValueUnit', item.Unit) : item.CustomUnit }}</template>
@@ -369,7 +369,7 @@ export default {
       const type = ['number', 'radio', 'select', 'input', 'textarea', 'calculation']
       questions.forEach(item => {
         if (type.includes(item.Type)) {
-          const answer = item.Type === 'select' && item.OptionTypeEnum === 1 && item.Answer ? JSON.parse(item.Answer) : item.Type === 'number' || item.Type === 'calculation' ? isNaN(parseFloat(item.Answer)) ? null : item.Answer : item.Answer
+          const answer = item.Type === 'select' && item.OptionTypeEnum === 1 && item.Answer ? JSON.parse(item.Answer) : item.Answer
           this.$set(this.questionForm, item.Id, answer)
         }
         if (item.QuestionType === 1013) {
@@ -498,7 +498,6 @@ export default {
 
     },
     formItemChange(val, item) {
-      console.log('formItemChange: ', item.QuestionName, val)
       this.formChanged = true
       // if (item.Type === 'number') {
       //   this.limitBlur(item.Id, item.ValueType)
@@ -546,6 +545,7 @@ export default {
       }
     },
     numberOrNEInput(id) {
+      this.formChanged = true
       // this.questionForm[id] = this.questionForm[id].toUpperCase();
       if (!this.questionForm[id]) {
         return
@@ -564,6 +564,11 @@ export default {
       this.questionForm[id] = value
       this.$set(this.questionForm, id, value)
     }, 
+    numberInput(id) {
+      this.formChanged = true
+      let value = this.questionForm[id].replace(/[^\d.]/g, '')
+      this.$set(this.questionForm, id, value)
+    },
     handleNumberOrNEBlur(item) {
       if (this.questionForm[item.Id] && !isNaN(parseFloat(this.questionForm[item.Id]))) {
         if (item.ValueType === 3) {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
index edce5886..c9924c12 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
@@ -122,7 +122,7 @@
                             v-else
                             type="number" 
                             @change="(val) => { formItemChange(val, item) }" 
-                            @input="(val) => questionForm[item.Id] = val.replace(/[^\d.]/g, '')"
+                            @input="numberInput(item.Id)"
                             @blur="handleBlur(questionForm[item.Id], questionForm, item)"
                             v-model.trim="questionForm[item.Id]" :disabled="readingTaskState === 2">
                             <template slot="append" v-if="item.Unit !== 0">{{ item.Unit !== 4 ? $fd('ValueUnit', item.Unit) : item.CustomUnit }}</template>
@@ -369,7 +369,7 @@ export default {
       const type = ['number', 'radio', 'select', 'input', 'textarea', 'calculation']
       questions.forEach(item => {
         if (type.includes(item.Type)) {
-          const answer = item.Type === 'select' && item.OptionTypeEnum === 1 && item.Answer ? JSON.parse(item.Answer) : item.Type === 'number' || item.Type === 'calculation' ? isNaN(parseFloat(item.Answer)) ? null : item.Answer : item.Answer
+          const answer = item.Type === 'select' && item.OptionTypeEnum === 1 && item.Answer ? JSON.parse(item.Answer) : item.Answer
           this.$set(this.questionForm, item.Id, answer)
         }
         if (item.QuestionType === 1013) {
@@ -541,6 +541,7 @@ export default {
       }
     },
     numberOrNEInput(id) {
+      this.formChanged = true
       // this.questionForm[id] = this.questionForm[id].toUpperCase();
       if (!this.questionForm[id]) {
         return
@@ -559,6 +560,11 @@ export default {
       this.questionForm[id] = value
       this.$set(this.questionForm, id, value)
     }, 
+    numberInput(id) {
+      this.formChanged = true
+      let value = this.questionForm[id].replace(/[^\d.]/g, '')
+      this.$set(this.questionForm, id, value)
+    },
     handleNumberOrNEBlur(item) {
       if (this.questionForm[item.Id] && !this.questionForm[item.Id].startsWith('N')) {
         if (item.ValueType === 3) {

From 0d3571f6727cc436253ba57b8e572ec48967a246 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 4 Mar 2026 13:31:28 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms/components/IVUS/UploadExcel.vue     |  4 ++--
 .../dicoms/components/OCT/UploadExcel.vue      | 18 ++++++++++--------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/UploadExcel.vue b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/UploadExcel.vue
index a36f76db..51f609ff 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/UploadExcel.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/UploadExcel.vue
@@ -56,11 +56,11 @@ export default {
         var data = new FormData()
         data.append('file', param.file)
         data.append('visitTaskId', this.visitTaskId)
-        data.append('readingImportType', 0)
+        data.append('readingImportType', 3)
         data.append('TableName', this.TableName)
         await readingImport(data)
         this.$emit('close')
-        this.$message.success('导入成功！')
+        this.$message.success(this.$t('common:message:savedSuccessfully'))
         loading.close()
       } catch (e) {
         loading.close()
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/OCT/UploadExcel.vue b/src/views/trials/trials-panel/reading/dicoms/components/OCT/UploadExcel.vue
index 0898161e..fc1ac7c0 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/OCT/UploadExcel.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/OCT/UploadExcel.vue
@@ -72,15 +72,17 @@ export default {
         data.append('file', param.file)
         data.append('visitTaskId', this.visitTaskId)
         data.append('TableName', this.TableName)
-        if (this.lesionType === 112) {
-          data.append('readingImportType', 1)
-          await readingImport(data)
-        } else {
-          data.append('readingImportType', 2)
-          await readingImport(data)
-        }
+        data.append('readingImportType', 3)
+        await readingImport(data)
+        // if (this.lesionType === 112) {
+        //   data.append('readingImportType', 1)
+        //   await readingImport(data)
+        // } else {
+        //   data.append('readingImportType', 2)
+        //   await readingImport(data)
+        // }
         this.$emit('close')
-        this.$message.success('导入成功！')
+        this.$message.success(this.$t('common:message:savedSuccessfully'))
         loading.close()
       } catch (e) {
         loading.close()

From 060b61eafb70c20999a532f526c8627cb4b73198 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 4 Mar 2026 14:50:02 +0800
Subject: [PATCH 6/8] =?UTF-8?q?ivus=E5=92=8Coct=E9=98=85=E7=89=87=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/DicomViewer.vue | 24 ++++++++++---------
 .../dicoms/components/IVUS/QuestionList.vue   |  3 +--
 .../dicoms/components/OCT/QuestionList.vue    |  2 +-
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
index d2bf4552..53ae87f2 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
@@ -495,17 +495,18 @@
               <h2 v-else style="color:#ddd">
                 Developing...
               </h2>
+              <div v-if="iseCRFShowInDicomReading && currentReadingTaskState < 2" v-show="listShow" class="form-footer">
+                <el-button type="primary" size="small" @click="skipTask">
+                  <!-- 跳过 -->
+                  {{ $t('trials:readingReport:button:skip') }}
+                </el-button>
+                <el-button type="primary" size="small" @click="submit">
+                  <!-- 提交 -->
+                  {{ $t('common:button:submit') }}
+                </el-button>
+              </div>
             </div>
-            <div v-if="iseCRFShowInDicomReading && currentReadingTaskState < 2" v-show="listShow" class="form-footer">
-              <el-button type="primary" size="small" @click="skipTask">
-                <!-- 跳过 -->
-                {{ $t('trials:readingReport:button:skip') }}
-              </el-button>
-              <el-button type="primary" size="small" @click="submit">
-                <!-- 提交 -->
-                {{ $t('common:button:submit') }}
-              </el-button>
-            </div>
+            
           </transition>
 
 
@@ -988,6 +989,7 @@ export default {
 
   },
   mounted() {
+    console.log(this.iseCRFShowInDicomReading, this.currentReadingTaskState, this.listShow)
     this.getHotKeys()
     this.getWwcTpl()
     this.getTrialCriterion()
@@ -2812,7 +2814,7 @@ export default {
 
     .form-footer {
       background: #000;
-      padding: 10px 0;
+      padding: 5px 0;
       text-align: center;
     }
 
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
index 5f9f2d02..b5bf4909 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
@@ -839,9 +839,8 @@ export default {
 </script>
 <style lang="scss" scoped>
 .measurement-wrapper {
-  height: 100%;
+  height: calc(100% - 50px);
   overflow-y: auto;
-
   .container {
     padding: 10px;
 
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
index c9924c12..b1fae15b 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
@@ -847,7 +847,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .measurement-wrapper {
-  height: 100%;
+  height: calc(100% - 50px);
   overflow-y: auto;
   // overflow: hidden;
 

From 3cef5afebd4aeda9ef44e2513df98b9115a3fbc8 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 5 Mar 2026 10:11:50 +0800
Subject: [PATCH 7/8] =?UTF-8?q?logo=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-layout/components/trialsNavbar.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/views/trials/trials-layout/components/trialsNavbar.vue b/src/views/trials/trials-layout/components/trialsNavbar.vue
index 004aa805..5a90faa0 100644
--- a/src/views/trials/trials-layout/components/trialsNavbar.vue
+++ b/src/views/trials/trials-layout/components/trialsNavbar.vue
@@ -1,14 +1,13 @@
 <template>
   <div class="trials-navbar" style="position: relative">
     <div class="leftMenu">
-      <img v-if="language === 'zh'" src="@/assets/zzlogo2.png" alt="" />
       <img
-        v-else-if="NODE_ENV === 'usa'"
+        v-if="NODE_ENV === 'usa'"
         src="@/assets/title-logo.png"
         alt=""
         class="title-logo"
       />
-      <img v-else src="@/assets/zzlogo4.png" alt="" />
+      <img v-else src="@/assets/system.png" alt="" style="width: 150px;height: 50px;margin-bottom: -7px;"/>
       <span style="white-space: nowrap" v-if="NODE_ENV !== 'usa'">
         <!-- 中心影像系统（EICS） -->
         {{ $t('trials:trials:title:eics') }}

From 7b694d4afbda6cf327225c72842d8c7b1760c0a1 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 5 Mar 2026 17:06:19 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E5=AF=B9OCT=E6=A0=87=E5=87=86=E4=B8=AD?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=AE=A1=E7=AE=97=E7=B1=BB=E5=9E=8B=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E5=9B=BD=E9=99=85=E5=8C=96=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/IVUS/QuestionList.vue          | 1 -
 .../reading/dicoms/components/OCT/QuestionList.vue           | 1 -
 .../trials-panel/reading/dicoms/components/QuestionItem.vue  | 2 +-
 .../trials-panel/reading/dicoms/components/Questions.vue     | 5 ++++-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
index b5bf4909..5306423e 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
@@ -112,7 +112,6 @@
                           </el-input>
                           <el-input
                             v-else
-                            type="number" 
                             @change="(val) => { formItemChange(val, item) }" 
                             @input="numberInput(item.Id)"
                             @blur="handleBlur(questionForm[item.Id], questionForm, item)"
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
index b1fae15b..e4806771 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
@@ -120,7 +120,6 @@
                           </el-input>
                           <el-input
                             v-else
-                            type="number" 
                             @change="(val) => { formItemChange(val, item) }" 
                             @input="numberInput(item.Id)"
                             @blur="handleBlur(questionForm[item.Id], questionForm, item)"
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
index ba60e88b..f97dbbcc 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
@@ -91,7 +91,7 @@
           @change="((val) => { formItemChange(val, question) })" />
         <!-- 下拉框 -->
         <el-select v-else-if="question.Type === 'select'" v-model="questionForm[question.Id]"
-          :disabled="readingTaskState >= 2 || ((question.TableQuestionType === 2 || question.QuestionGenre === 2) && !!question.DictionaryCode) || isFirstChangeTask || question.QuestionType === 50 || question.QuestionType === 55"
+          :disabled="readingTaskState >= 2 || ((question.TableQuestionType === 2 || question.QuestionGenre === 2) && !!question.DictionaryCode) || isFirstChangeTask || question.QuestionType === 50 || question.QuestionType === 55 || question.QuestionType === 1026"
           clearable :multiple="question.OptionTypeEnum === 1" @change="((val) => { formItemChange(val, question) })">
           <template v-if="question.TableQuestionType === 1">
             <el-option v-for="item in organList" :key="item.Id" :label="item[question.DataTableColumn]"
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
index 04f2b61d..2cc8b0dc 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
@@ -234,7 +234,10 @@ export default {
       obj.forEach(i => {
         i.IsBaseLineTask = this.isBaseLineTask
         if (i.Type !== 'group' && i.Type !== 'summary' && i.Id) {
-          const answer = i.Type === 'select' && i.OptionTypeEnum === 1 && i.Answer ? JSON.parse(i.Answer) : i.Answer
+          let answer = i.Type === 'select' && i.OptionTypeEnum === 1 && i.Answer ? JSON.parse(i.Answer) : i.Answer
+          if (i.DictionaryCode && i.Type === 'calculation') {
+            answer = this.$fd(i.DictionaryCode, parseInt(i.Answer))
+          }
           this.$set(this.questionForm, i.Id, answer ? answer : null)
           if (i.QuestionType === 44) {
             // 影响质量评估