diff --git a/src/api/trials.js b/src/api/trials.js
index bd299412..a07d282a 100644
--- a/src/api/trials.js
+++ b/src/api/trials.js
@@ -1364,9 +1364,9 @@ export function getForwardList(param) {
   })
 }
 
-export function getNoneDicomStudyList(subjectVisitId, sudyId = '', isFilterZip = false) {
+export function getNoneDicomStudyList(subjectVisitId, sudyId = '', isFilterZip = false, visitTaskId = '') {
   return request({
-    url: `/NoneDicomStudy/getNoneDicomStudyList?subjectVisitId=${subjectVisitId}&nonedicomStudyId=${sudyId}&isFilterZip=${isFilterZip}`,
+    url: `/NoneDicomStudy/getNoneDicomStudyList?subjectVisitId=${subjectVisitId}&nonedicomStudyId=${sudyId}&isFilterZip=${isFilterZip}&visitTaskId=${visitTaskId}`,
     method: 'get'
   })
 }
diff --git a/src/components/downloadDicomAndNonedicom/index.vue b/src/components/downloadDicomAndNonedicom/index.vue
index 0564608d..a39ff0ce 100644
--- a/src/components/downloadDicomAndNonedicom/index.vue
+++ b/src/components/downloadDicomAndNonedicom/index.vue
@@ -148,6 +148,7 @@ import {
 import studyView from '@/components/uploadDicomAndNonedicom/study-view.vue'
 import store from '@/store'
 import { downLoadFile } from '@/utils/stream.js'
+import { getToken } from '@/utils/auth'
 let defaultSearchData = () => {
   return {
     SubjectId: null,
@@ -202,6 +203,7 @@ export default {
       },
       modelList: [],
       IsDicom: true,
+      open: null,
     }
   },
   mounted() {
@@ -364,6 +366,9 @@ export default {
         this.modelList = item.DicomStudyList
       } else {
         this.modelList = item.NoneDicomStudyList
+        this.modelList.forEach((data) => {
+          data.SourceSubjectVisitId = item.SourceSubjectVisitId
+        })
       }
       this.IsDicom = item.IsDicom
       this.model_cfg.visible = true
@@ -379,6 +384,37 @@ export default {
       this.searchData.PageIndex = 1
       this.getList()
     },
+    preview(row) {
+      if (!row.IsDicom) {
+        this.handlePreviewNoneDicomFiles(row)
+      } else {
+        this.handleViewReadingImages(row)
+      }
+    },
+    // 预览单个检查下非Dicom文件
+    handlePreviewNoneDicomFiles(row) {
+      if (this.open) {
+        this.open.close()
+      }
+      let trialId = this.$route.query.trialId
+      var token = getToken()
+      const routeData = this.$router.resolve({
+        path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${row.SourceSubjectVisitId}&visitTaskId=${row.VisitTaskId}&TokenKey=${token}`,
+      })
+      this.open = window.open(routeData.href, '_blank')
+    },
+    // 预览阅片影像
+    handleViewReadingImages(row) {
+      if (this.open) {
+        this.open.close()
+      }
+      var token = getToken()
+      let trialId = this.$route.query.trialId
+      const routeData = this.$router.resolve({
+        path: `/showvisitdicoms?trialId=${trialId}&visitInfo=${row.VisitName}(${row.VisitNum})&subjectVisitId=${row.SourceSubjectVisitId}&isReading=1&TokenKey=${token}`,
+      })
+      this.open = window.open(routeData.href, '_blank')
+    },
   },
 }
 </script>
diff --git a/src/components/uploadDicomAndNonedicom/dicomFile.vue b/src/components/uploadDicomAndNonedicom/dicomFile.vue
index 0b8f31ea..193a80d2 100644
--- a/src/components/uploadDicomAndNonedicom/dicomFile.vue
+++ b/src/components/uploadDicomAndNonedicom/dicomFile.vue
@@ -115,6 +115,11 @@
             <el-button
               circle
               icon="el-icon-view"
+              :disabled="
+                !scope.row.UploadStudyList ||
+                scope.row.UploadStudyList.length <= 0
+              "
+              @click.stop="handleViewReadingImages(scope.row)"
               :title="$t('upload:dicom:button:preview')"
             />
             <!--删除--->
@@ -453,6 +458,7 @@ import { convertBytes } from '@/utils/dicom-character-set'
 import { parseDicom } from '@/utils/parseDicom.js'
 import { dcmUpload } from '@/utils/dcmUpload/dcmUpload'
 import store from '@/store'
+import { getToken } from '@/utils/auth'
 export default {
   name: 'dicomFile',
   props: {
@@ -505,6 +511,7 @@ export default {
       trialId: null,
       subjectVisitId: null,
       errStudyUidList: [],
+      open: null,
     }
   },
   created() {
@@ -1444,6 +1451,18 @@ export default {
       let blob = new Blob(['\ufeff', text], { type: 'text/plain' })
       return blob
     },
+    // 预览阅片影像
+    handleViewReadingImages(row) {
+      if (this.open) {
+        this.open.close()
+      }
+      var token = getToken()
+      let trialId = this.$route.query.trialId
+      const routeData = this.$router.resolve({
+        path: `/showvisitdicoms?trialId=${trialId}&visitInfo=${row.VisitName}(${row.VisitNum})&subjectVisitId=${row.SourceSubjectVisitId}&isReading=1&TokenKey=${token}`,
+      })
+      this.open = window.open(routeData.href, '_blank')
+    },
   },
 }
 </script>
diff --git a/src/components/uploadDicomAndNonedicom/index.vue b/src/components/uploadDicomAndNonedicom/index.vue
index 058f4514..472ece43 100644
--- a/src/components/uploadDicomAndNonedicom/index.vue
+++ b/src/components/uploadDicomAndNonedicom/index.vue
@@ -62,10 +62,13 @@ export default {
   },
   data() {
     return {
-      title: 'Upload Images：01 > 01001 >Timepoint',
+      title: '',
       activeName: 'dicom',
     }
   },
+  mounted() {
+    this.title = `Upload Images：${this.SubjectCode}（${this.Criterion.TrialReadingCriterionName}）`
+  },
   methods: {
     beforeClose() {
       this.$emit('update:visible', false)
diff --git a/src/components/uploadDicomAndNonedicom/nonedicomFile.vue b/src/components/uploadDicomAndNonedicom/nonedicomFile.vue
index 8d28d1e3..0207e11c 100644
--- a/src/components/uploadDicomAndNonedicom/nonedicomFile.vue
+++ b/src/components/uploadDicomAndNonedicom/nonedicomFile.vue
@@ -411,6 +411,9 @@ export default {
   created() {
     this.getList()
   },
+  beforeDestroy() {
+    store.dispatch('trials/setUnLock', false)
+  },
   methods: {
     async getList() {
       try {
@@ -550,7 +553,7 @@ export default {
       let trialId = this.$route.query.trialId
       var token = getToken()
       const routeData = this.$router.resolve({
-        path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${row.SourceSubjectVisitId}&studyId=${row.Id}&TokenKey=${token}`,
+        path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${row.SourceSubjectVisitId}&studyId=${row.Id}&visitTaskId=${row.VisitTaskId}&TokenKey=${token}`,
       })
       this.open = window.open(routeData.href, '_blank')
     },
diff --git a/src/components/uploadDicomAndNonedicom/study-view.vue b/src/components/uploadDicomAndNonedicom/study-view.vue
index 92f06b67..520c0d73 100644
--- a/src/components/uploadDicomAndNonedicom/study-view.vue
+++ b/src/components/uploadDicomAndNonedicom/study-view.vue
@@ -118,10 +118,19 @@ export default {
   methods: {
     // 预览
     preview(row) {
-      var token = getToken()
-      const routeData = this.$router.resolve({
-        path: `/showdicom?studyId=${row.Id}&TokenKey=${token}&type=Study`,
-      })
+      let routeData = null
+      if (this.IsDicom) {
+        var token = getToken()
+        routeData = this.$router.resolve({
+          path: `/showdicom?studyId=${row.Id}&TokenKey=${token}&type=Study`,
+        })
+      } else {
+        let trialId = this.$route.query.trialId
+        var token = getToken()
+        routeData = this.$router.resolve({
+          path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${row.SourceSubjectVisitId}&studyId=${row.Id}&TokenKey=${token}`,
+        })
+      }
       window.open(routeData.href, '_blank')
     },
   },
diff --git a/src/store/modules/trials.js b/src/store/modules/trials.js
index 0422295e..cb52300b 100644
--- a/src/store/modules/trials.js
+++ b/src/store/modules/trials.js
@@ -9,7 +9,7 @@ const getDefaultState = () => {
     studyListQuery: null,
     unlock: false,
     config: {},
-    uploadTip: '0.00kb/s',
+    uploadTip: '0.00KB/s',
     timer: null,
     whiteList: [],
     checkTaskId: null
diff --git a/src/utils/multipartUpload/aws.js b/src/utils/multipartUpload/aws.js
index 3de55a21..0fdd1a90 100644
--- a/src/utils/multipartUpload/aws.js
+++ b/src/utils/multipartUpload/aws.js
@@ -14,7 +14,7 @@ export function AWSclose() {
     if (timer) {
         clearInterval(timer);
         timer = null;
-        store.state.trials.uploadTip = '0kb/s'
+        store.state.trials.uploadTip = '0KB/s'
     }
     bytesReceivedPerSecond = {};
 }
@@ -440,10 +440,10 @@ function setTimer() {
         let timeList = Object.keys(bytesReceivedPerSecond).sort((a, b) => a - b);
         if (timeList.length > 0) {
             let totalBytes = timeList.reduce((sum, bytes) => sum + bytesReceivedPerSecond[bytes], 0) / (5 * 1024);
-            let unit = 'kb/s';
+            let unit = 'KB/s';
             if (totalBytes > 1024) {
                 totalBytes = totalBytes / 1024;
-                unit = "mb/s";
+                unit = "MB/s";
             }
             store.state.trials.uploadTip = totalBytes.toFixed(2) + unit;
         }
diff --git a/src/utils/multipartUpload/oss.js b/src/utils/multipartUpload/oss.js
index 5ee667b4..16405723 100644
--- a/src/utils/multipartUpload/oss.js
+++ b/src/utils/multipartUpload/oss.js
@@ -8,7 +8,7 @@ export function OSSclose() {
     if (timer) {
         clearInterval(timer);
         timer = null;
-        store.state.trials.uploadTip = '0kb/s'
+        store.state.trials.uploadTip = '0KB/s'
     }
     bytesReceivedPerSecond = {};
     savaData = {};
@@ -140,10 +140,10 @@ function setTimer() {
         let timeList = Object.keys(bytesReceivedPerSecond).sort((a, b) => a - b);
         if (timeList.length > 0) {
             let totalBytes = timeList.reduce((sum, bytes) => sum + bytesReceivedPerSecond[bytes], 0) / (5 * 1024);
-            let unit = 'kb/s';
+            let unit = 'KB/s';
             if (totalBytes > 1024) {
                 totalBytes = totalBytes / 1024;
-                unit = "mb/s";
+                unit = "MB/s";
             }
             store.state.trials.uploadTip = totalBytes.toFixed(2) + unit;
         }
diff --git a/src/views/dictionary/template/components/CriterionQuestionForm.vue b/src/views/dictionary/template/components/CriterionQuestionForm.vue
index 6f5c12a7..27dd77fb 100644
--- a/src/views/dictionary/template/components/CriterionQuestionForm.vue
+++ b/src/views/dictionary/template/components/CriterionQuestionForm.vue
@@ -10,7 +10,15 @@
   >
     <div class="base-dialog-body">
       <el-form-item label="类型" prop="Type">
-        <el-select v-model="form.Type" clearable @change="((val)=>{typeChange(val, form)})">
+        <el-select
+          v-model="form.Type"
+          clearable
+          @change="
+            (val) => {
+              typeChange(val, form)
+            }
+          "
+        >
           <el-option
             v-for="item of $d.Criterion_Question_Type"
             :key="item.value"
@@ -31,10 +39,7 @@
         v-if="form.Type === 'group'"
         prop="GroupClassify"
       >
-        <el-select
-          v-model="form.GroupClassify"
-          clearable
-        >
+        <el-select v-model="form.GroupClassify" clearable>
           <el-option
             v-for="item of groupClassifyList"
             :key="item.Id"
@@ -70,13 +75,9 @@
         v-if="form.Type === 'number' || form.Type === 'calculation'"
         label="数值类型"
         prop="ValueType"
-        :rules="[
-          { required: true, message: '请选择'}
-        ]"
+        :rules="[{ required: true, message: '请选择' }]"
       >
-        <el-radio-group
-          v-model="form.ValueType"
-        >
+        <el-radio-group v-model="form.ValueType">
           <el-radio
             v-for="item of $d.ValueType"
             :key="item.id"
@@ -92,9 +93,7 @@
         v-if="form.Type === 'number' || form.Type === 'calculation'"
         label="单位"
       >
-        <el-radio-group
-          v-model="form.Unit"
-        >
+        <el-radio-group v-model="form.Unit">
           <el-radio
             v-for="item of $d.ValueUnit"
             :key="item.id"
@@ -109,15 +108,12 @@
         label="表格类型标识"
         prop="LesionType"
       >
-        <el-select
-          v-model="form.LesionType"
-          clearable
-        >
+        <el-select v-model="form.LesionType" clearable>
           <el-option
             v-for="item of lesionTypes"
             :key="item.Code"
             :value="parseInt(item.Code)"
-            :label="$fd('LesionType',parseInt(item.Code))"
+            :label="$fd('LesionType', parseInt(item.Code))"
           />
         </el-select>
       </el-form-item>
@@ -133,25 +129,27 @@
       </el-form-item> -->
       <!-- 选项类型 -->
       <el-form-item
-        v-if="form.Type === 'select' || form.Type === 'radio' || form.Type === 'calculation'"
+        v-if="
+          form.Type === 'select' ||
+          form.Type === 'radio' ||
+          form.Type === 'calculation'
+        "
         label="选项类型"
         prop="QuestionGenre"
-        :rules="[
-          { required: form.Type !== 'calculation', message: '请选择'}
-        ]"
+        :rules="[{ required: form.Type !== 'calculation', message: '请选择' }]"
       >
         <el-radio-group
           v-model="form.QuestionGenre"
-          @change="((val)=>{questionGenreChange(val, form)})"
+          @change="
+            (val) => {
+              questionGenreChange(val, form)
+            }
+          "
         >
-          <el-radio
-            :label="-1"
-          >
-            无
-          </el-radio>
+          <el-radio :label="-1"> 无 </el-radio>
           <el-radio
             v-for="item of $d.TableQuestionType"
-            v-show="item.value===0 || item.value===3"
+            v-show="item.value === 0 || item.value === 3"
             :key="item.id"
             :label="item.value"
           >
@@ -183,13 +181,8 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item
-        label="转化显示类型"
-        prop="ConvertShowType"
-      >
-        <el-radio-group
-          v-model="form.ConvertShowType"
-        >
+      <el-form-item label="转化显示类型" prop="ConvertShowType">
+        <el-radio-group v-model="form.ConvertShowType">
           <el-radio
             v-for="item of $d.ConvertShowType"
             :key="item.id"
@@ -200,11 +193,19 @@
         </el-radio-group>
       </el-form-item>
       <el-form-item
-        v-if="form.QuestionGenre === 3 "
+        v-if="form.QuestionGenre === 3"
         label="关联字典"
         prop="DictionaryCode"
       >
-        <el-select v-model="form.DictionaryCode" clearable @change="() => {form.DefaultValue = null}">
+        <el-select
+          v-model="form.DictionaryCode"
+          clearable
+          @change="
+            () => {
+              form.DefaultValue = null
+            }
+          "
+        >
           <el-option
             v-for="item of dicList"
             :key="item.Id"
@@ -213,10 +214,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item
-        v-if="form.QuestionGenre === 3 "
-        label="默认值"
-      >
+      <el-form-item v-if="form.QuestionGenre === 3" label="默认值">
         <el-select v-model="form.DefaultValue" clearable>
           <el-option
             v-for="item of form.DictionaryCode ? $d[form.DictionaryCode] : []"
@@ -226,10 +224,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item
-        v-if="form.QuestionGenre === 0 "
-        label="默认值"
-      >
+      <el-form-item v-if="form.QuestionGenre === 0" label="默认值">
         <el-select v-model="form.DefaultValue" clearable>
           <el-option
             v-for="item of form.TypeValue ? form.TypeValue.split('|') : []"
@@ -240,10 +235,18 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item v-if="form.Type !== 'group'" label="是否显示" prop="ShowQuestion">
+      <el-form-item
+        v-if="form.Type !== 'group'"
+        label="是否显示"
+        prop="ShowQuestion"
+      >
         <el-radio-group
           v-model="form.ShowQuestion"
-          @change="((val)=>{isShowQuestionChange(val, form)})"
+          @change="
+            (val) => {
+              isShowQuestionChange(val, form)
+            }
+          "
         >
           <el-radio
             v-for="item of $d.ShowQuestion"
@@ -257,14 +260,18 @@
 
       <!-- 显示时依赖父问题 -->
       <el-form-item
-        v-if="form.Type !== 'group' && form.ShowQuestion===1"
+        v-if="form.Type !== 'group' && form.ShowQuestion === 1"
         label="显示依赖父问题"
         prop="ParentId"
       >
         <el-select
           v-model="form.ParentId"
           clearable
-          @change="((val)=>{parentQuestionChange(val, form)})"
+          @change="
+            (val) => {
+              parentQuestionChange(val, form)
+            }
+          "
         >
           <el-option
             v-for="item of parentOptions"
@@ -275,15 +282,19 @@
         </el-select>
       </el-form-item>
       <!-- 显示时依赖父问题触发值 -->
-      <el-form-item v-if="form.ParentId && form.ShowQuestion===1" label="显示触发值" prop="ParentTriggerValueList">
-<!--        <el-select v-model="form.ParentTriggerValue" clearable>-->
-<!--          <el-option-->
-<!--            v-for="item of parentTriggerValOptions"-->
-<!--            :key="item.id"-->
-<!--            :label="item.label"-->
-<!--            :value="item.value.toString()"-->
-<!--          />-->
-<!--        </el-select>-->
+      <el-form-item
+        v-if="form.ParentId && form.ShowQuestion === 1"
+        label="显示触发值"
+        prop="ParentTriggerValueList"
+      >
+        <!--        <el-select v-model="form.ParentTriggerValue" clearable>-->
+        <!--          <el-option-->
+        <!--            v-for="item of parentTriggerValOptions"-->
+        <!--            :key="item.id"-->
+        <!--            :label="item.label"-->
+        <!--            :value="item.value.toString()"-->
+        <!--          />-->
+        <!--        </el-select>-->
         <el-select v-model="form.ParentTriggerValueList" clearable multiple>
           <el-option
             v-for="item of parentTriggerValOptions"
@@ -293,16 +304,44 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item v-if="form.Type === 'select' || form.Type === 'radio' || form.Type === 'calculation'" label="是否裁判问题">
-        <el-radio-group v-model="form.IsJudgeQuestion" @change="((val)=>{isJudgeQuestionChange(val, form)})">
-          <el-radio v-for="item of $d.YesOrNo" :key="`YesOrNo${item.value}`"  :label="item.value">{{ item.label }}</el-radio>
+      <el-form-item
+        v-if="
+          form.Type === 'select' ||
+          form.Type === 'radio' ||
+          form.Type === 'calculation' ||
+          form.Type === 'number'
+        "
+        label="是否裁判问题"
+      >
+        <el-radio-group
+          v-model="form.IsJudgeQuestion"
+          @change="
+            (val) => {
+              isJudgeQuestionChange(val, form)
+            }
+          "
+        >
+          <el-radio
+            v-for="item of $d.YesOrNo"
+            :key="`YesOrNo${item.value}`"
+            :label="item.value"
+            >{{ item.label }}</el-radio
+          >
         </el-radio-group>
       </el-form-item>
-      <el-form-item v-if="form.Type !== 'group' && form.Type !== 'table'" label="是否必填" prop="IsRequired">
+      <el-form-item
+        v-if="form.Type !== 'group' && form.Type !== 'table'"
+        label="是否必填"
+        prop="IsRequired"
+      >
         <el-radio-group
           v-model="form.IsRequired"
-          :disabled="form.IsJudgeQuestion===true || form.ShowQuestion===2"
-          @change="((val)=>{isRequiredChange(val, form)})"
+          :disabled="form.IsJudgeQuestion === true || form.ShowQuestion === 2"
+          @change="
+            (val) => {
+              isRequiredChange(val, form)
+            }
+          "
         >
           <el-radio
             v-for="item of $d.QuestionRequired"
@@ -323,7 +362,11 @@
         <el-select
           v-model="form.RelevanceId"
           clearable
-          @change="((val)=>{relevanceQuestionChange(val, form)})"
+          @change="
+            (val) => {
+              relevanceQuestionChange(val, form)
+            }
+          "
         >
           <el-option
             v-for="item of parentOptions"
@@ -339,14 +382,14 @@
         label="必填触发值"
         prop="RelevanceValueList"
       >
-<!--        <el-select v-model="form.RelevanceValue" clearable>-->
-<!--          <el-option-->
-<!--            v-for="item of reParentTriggerValOptions"-->
-<!--            :key="item.id"-->
-<!--            :label="item.label"-->
-<!--            :value="item.value.toString()"-->
-<!--          />-->
-<!--        </el-select>-->
+        <!--        <el-select v-model="form.RelevanceValue" clearable>-->
+        <!--          <el-option-->
+        <!--            v-for="item of reParentTriggerValOptions"-->
+        <!--            :key="item.id"-->
+        <!--            :label="item.label"-->
+        <!--            :value="item.value.toString()"-->
+        <!--          />-->
+        <!--        </el-select>-->
         <el-select v-model="form.RelevanceValueList" clearable multiple>
           <el-option
             v-for="item of reParentTriggerValOptions"
@@ -385,7 +428,11 @@
       </el-form-item> -->
 
       <el-form-item v-if="form.Type !== 'group'" label="问题分组">
-        <el-select v-model="form.GroupId" clearable :disabled="isParentExistGroup">
+        <el-select
+          v-model="form.GroupId"
+          clearable
+          :disabled="isParentExistGroup"
+        >
           <el-option
             v-for="group of groupOptions"
             :key="group.GroupId"
@@ -396,12 +443,22 @@
       </el-form-item>
       <el-form-item label="限制编辑">
         <el-radio-group v-model="form.LimitEdit">
-          <el-radio v-for="item of $d.LimitEdit" :key="`LimitEdit${item.value}`" :label="item.value">{{ item.label }}</el-radio>
+          <el-radio
+            v-for="item of $d.LimitEdit"
+            :key="`LimitEdit${item.value}`"
+            :label="item.value"
+            >{{ item.label }}</el-radio
+          >
         </el-radio-group>
       </el-form-item>
       <el-form-item label="全局阅片是否显示">
         <el-radio-group v-model="form.GlobalReadingShowType">
-          <el-radio v-for="item of $d.GlobalReadingShowType" :key="item.id" :label="item.value">{{ item.label }}</el-radio>
+          <el-radio
+            v-for="item of $d.GlobalReadingShowType"
+            :key="item.id"
+            :label="item.value"
+            >{{ item.label }}</el-radio
+          >
         </el-radio-group>
       </el-form-item>
       <el-form-item
@@ -409,10 +466,7 @@
         v-if="form.Type !== 'group'"
         prop="QuestionType"
       >
-        <el-select
-          v-model="form.QuestionType"
-          clearable
-        >
+        <el-select v-model="form.QuestionType" clearable>
           <el-option
             v-for="item of CriterionDictionaryList.QuestionType"
             :key="item.Id"
@@ -428,9 +482,18 @@
         </el-radio-group>
       </el-form-item> -->
       <el-form-item v-if="form.Type === 'upload'" label="最大上传个数">
-        <el-input-number v-model="form.ImageCount" controls-position="right" :min="1" :max="10" />
+        <el-input-number
+          v-model="form.ImageCount"
+          controls-position="right"
+          :min="1"
+          :max="10"
+        />
       </el-form-item>
-      <el-form-item v-if="form.Type === 'select' || form.Type === 'radio'" label="高亮标记值" prop="HighlightAnswerList">
+      <el-form-item
+        v-if="form.Type === 'select' || form.Type === 'radio'"
+        label="高亮标记值"
+        prop="HighlightAnswerList"
+      >
         <el-select v-model="form.HighlightAnswerList" clearable multiple>
           <template v-if="form.TypeValue">
             <el-option
@@ -471,20 +534,23 @@
 
       <el-form-item label="是否在阅片页面显示">
         <el-radio-group v-model="form.IsShowInDicom">
-          <el-radio v-for="item of $d.YesOrNo" :key="`YesOrNo${item.value}`" :label="item.value">{{ item.label }}</el-radio>
+          <el-radio
+            v-for="item of $d.YesOrNo"
+            :key="`YesOrNo${item.value}`"
+            :label="item.value"
+            >{{ item.label }}</el-radio
+          >
         </el-radio-group>
       </el-form-item>
       <el-form-item
         :label="$t('trials:readingUnit:qsList:title:Remark')"
         prop="Remark"
       >
-        <el-input
-          v-model="form.Remark"
-        />
+        <el-input v-model="form.Remark" />
       </el-form-item>
     </div>
 
-    <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
+    <div class="base-dialog-footer" style="text-align: right; margin-top: 10px">
       <el-form-item>
         <!-- 取消 -->
         <el-button
@@ -496,7 +562,12 @@
           {{ $t('common:button:cancel') }}
         </el-button>
         <!-- 保存 -->
-        <el-button size="small" type="primary" :loading="btnLoading" @click="save">
+        <el-button
+          size="small"
+          type="primary"
+          :loading="btnLoading"
+          @click="save"
+        >
           {{ $t('common:button:save') }}
         </el-button>
       </el-form-item>
@@ -504,20 +575,31 @@
   </el-form>
 </template>
 <script>
-import { getBasicConfigSelect, addOrUpdateReadingQuestionSystem, getSystemCriterionOtherQuestion, getSystemGroupNameList, getCriterionDictionary, getCriterionDictionaryList } from '@/api/dictionary'
+import {
+  getBasicConfigSelect,
+  addOrUpdateReadingQuestionSystem,
+  getSystemCriterionOtherQuestion,
+  getSystemGroupNameList,
+  getCriterionDictionary,
+  getCriterionDictionaryList,
+} from '@/api/dictionary'
 import { getCriterionLesionType } from '@/api/trials'
 export default {
   name: 'AddOrUpdateClinicalData',
   props: {
     data: {
       type: Object,
-      default() { return {} }
+      default() {
+        return {}
+      },
     },
     type: {
       type: String,
-      default() { return '' }
-    }
-  }, 
+      default() {
+        return ''
+      },
+    },
+  },
   data() {
     var validateTypeVal = (rule, value, callback) => {
       if (value === '') {
@@ -553,7 +635,7 @@ export default {
         IsJudgeQuestion: false,
         GroupName: '',
         GroupEnName: '',
-        GroupClassify:null,
+        GroupClassify: null,
         Remark: '',
         ImageCount: 1,
         RelevanceId: '',
@@ -570,32 +652,38 @@ export default {
         GroupId: null,
         ConvertShowType: 0,
         QuestionClassify: null,
-        HighlightAnswerList: []
+        HighlightAnswerList: [],
       },
       rules: {
-        Type: [
-          { required: true, message: '请选择', trigger: 'blur' }
+        Type: [{ required: true, message: '请选择', trigger: 'blur' }],
+        LesionType: [{ required: true, message: '请选择', trigger: 'blur' }],
+        QuestionName: [
+          { required: true, message: '请注明', trigger: 'blur' },
+          { max: 300, message: '最大长度为 300' },
         ],
-        LesionType: [
-          { required: true, message: '请选择', trigger: 'blur' }
-        ],
-        QuestionName: [{ required: true, message: '请注明', trigger: 'blur' },
-          { max: 300, message: '最大长度为 300' }],
         QuestionGenre: [{ required: true, message: '请选择', trigger: 'blur' }],
-        TypeValue: [{ required: true, message: '请注明', trigger: 'blur' },
+        TypeValue: [
+          { required: true, message: '请注明', trigger: 'blur' },
           { validator: validateTypeVal, trigger: 'blur' },
-          { max: 500, message: '最大长度为 500' }],
-        DictionaryCode: [{ required: true, message: '请选择', trigger: 'blur' }],
+          { max: 500, message: '最大长度为 500' },
+        ],
+        DictionaryCode: [
+          { required: true, message: '请选择', trigger: 'blur' },
+        ],
         ShowQuestion: [{ required: true, message: '请选择', trigger: 'blur' }],
         IsRequired: [{ required: true, message: '请选择', trigger: 'blur' }],
         ParentId: [{ required: true, message: '请选择', trigger: 'blur' }],
         ParentTriggerValueList: [
-          { required: true, message: '请选择', trigger: 'blur' }
+          { required: true, message: '请选择', trigger: 'blur' },
         ],
         RelevanceId: [{ required: true, message: '请选择', trigger: 'blur' }],
-        RelevanceValueList: [{ required: true, message: '请选择', trigger: 'blur' }],
-        GroupName: [{ required: true, message: '请注明', trigger: 'blur' },
-          { max: 50, message: '最大长度为 50' }]
+        RelevanceValueList: [
+          { required: true, message: '请选择', trigger: 'blur' },
+        ],
+        GroupName: [
+          { required: true, message: '请注明', trigger: 'blur' },
+          { max: 50, message: '最大长度为 50' },
+        ],
       },
       loading: false,
       btnLoading: false,
@@ -606,8 +694,8 @@ export default {
       lesionTypes: [],
       dicList: [],
       CriterionDictionaryList: [],
-      groupClassifyList:[],
-      highlightAnswers: []
+      groupClassifyList: [],
+      highlightAnswers: [],
     }
   },
   watch: {
@@ -622,14 +710,14 @@ export default {
           }
           let res = await getCriterionDictionary({
             ReadingCriterionId: this.data.ReadingQuestionCriterionSystemId,
-            DictionaryCode: this.form.DictionaryCode
+            DictionaryCode: this.form.DictionaryCode,
           })
           this.highlightAnswers = res.Result[this.form.DictionaryCode]
         } catch (e) {
           console.log(e)
         }
-      }
-    }
+      },
+    },
   },
   mounted() {
     this.initForm()
@@ -638,16 +726,16 @@ export default {
     getCriterionDictionary() {
       getCriterionDictionary({
         ReadingCriterionId: this.data.ReadingQuestionCriterionSystemId,
-        DictionaryCode: 'QuestionType'
-      }).then(res => {
+        DictionaryCode: 'QuestionType',
+      }).then((res) => {
         this.CriterionDictionaryList = res.Result
       })
     },
     getGroupClassifyDictionary() {
       getCriterionDictionary({
         ReadingCriterionId: this.data.ReadingQuestionCriterionSystemId,
-        DictionaryCode: 'GroupClassify'
-      }).then(res => {
+        DictionaryCode: 'GroupClassify',
+      }).then((res) => {
         this.groupClassifyList = res.Result.GroupClassify
       })
     },
@@ -661,37 +749,47 @@ export default {
             this.form[k] = this.data[k]
           }
         }
-        if (this.form.ParentId !== '' && this.form.ParentId !== null && this.form.GroupName !== '') {
+        if (
+          this.form.ParentId !== '' &&
+          this.form.ParentId !== null &&
+          this.form.GroupName !== ''
+        ) {
           this.isParentExistGroup = true
         }
         if (this.form.ParentId) {
-          var index = this.parentOptions.findIndex(item => {
+          var index = this.parentOptions.findIndex((item) => {
             return item.QuestionId === this.form.ParentId
           })
           if (index !== -1) {
             if (this.parentOptions[index].QuestionGenre === 3) {
-              this.parentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
+              this.parentTriggerValOptions =
+                this.$d[this.parentOptions[index].DictionaryCode]
             } else {
               const options = []
-              this.parentOptions[index].TypeValue.split('|').forEach((item, index) => {
-                options.push({ id: index, label: item, value: item })
-              })
+              this.parentOptions[index].TypeValue.split('|').forEach(
+                (item, index) => {
+                  options.push({ id: index, label: item, value: item })
+                }
+              )
               this.parentTriggerValOptions = options
             }
           }
         }
         if (this.form.RelevanceId) {
-          var index = this.parentOptions.findIndex(item => {
+          var index = this.parentOptions.findIndex((item) => {
             return item.QuestionId === this.form.RelevanceId
           })
           if (index !== -1) {
             if (this.parentOptions[index].QuestionGenre === 3) {
-              this.reParentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
+              this.reParentTriggerValOptions =
+                this.$d[this.parentOptions[index].DictionaryCode]
             } else {
               const options = []
-              this.parentOptions[index].TypeValue.split('|').forEach((item, index) => {
-                options.push({ id: index, label: item, value: item })
-              })
+              this.parentOptions[index].TypeValue.split('|').forEach(
+                (item, index) => {
+                  options.push({ id: index, label: item, value: item })
+                }
+              )
               this.reParentTriggerValOptions = options
             }
           }
@@ -701,18 +799,19 @@ export default {
       this.getGroupClassifyDictionary()
     },
     save() {
-      this.$refs.clinicalDataForm.validate(valid => {
+      this.$refs.clinicalDataForm.validate((valid) => {
         if (!valid) return
         this.btnLoading = true
         if (this.form.Type !== 'upload') {
           this.form.ImageCount = 0
         }
-        addOrUpdateReadingQuestionSystem(this.form).then(res => {
-          this.btnLoading = false
-          this.$emit('getList')
-          this.$emit('close')
-          this.$message.success(this.$t('common:message:savedSuccessfully'))
-        })
+        addOrUpdateReadingQuestionSystem(this.form)
+          .then((res) => {
+            this.btnLoading = false
+            this.$emit('getList')
+            this.$emit('close')
+            this.$message.success(this.$t('common:message:savedSuccessfully'))
+          })
           .catch(() => {
             this.btnLoading = false
           })
@@ -722,33 +821,38 @@ export default {
       return new Promise((resolve, reject) => {
         this.loading = true
         var param = {
-          criterionId: this.data.ReadingQuestionCriterionSystemId
+          criterionId: this.data.ReadingQuestionCriterionSystemId,
         }
-        getSystemGroupNameList(param).then(res => {
-          this.groupOptions = res.Result
-          this.loading = false
-          resolve()
-        }).catch(() => {
-          this.loading = false
-          reject()
-        })
+        getSystemGroupNameList(param)
+          .then((res) => {
+            this.groupOptions = res.Result
+            this.loading = false
+            resolve()
+          })
+          .catch(() => {
+            this.loading = false
+            reject()
+          })
       })
     },
     getParentQuestions() {
       return new Promise((resolve, reject) => {
         this.loading = true
         var param = {
-          readingQuestionCriterionSystemId: this.data.ReadingQuestionCriterionSystemId,
-          id: this.data.Id
+          readingQuestionCriterionSystemId:
+            this.data.ReadingQuestionCriterionSystemId,
+          id: this.data.Id,
         }
-        getSystemCriterionOtherQuestion(param).then(res => {
-          this.parentOptions = res.Result
-          this.loading = false
-          resolve()
-        }).catch(() => {
-          this.loading = false
-          reject()
-        })
+        getSystemCriterionOtherQuestion(param)
+          .then((res) => {
+            this.parentOptions = res.Result
+            this.loading = false
+            resolve()
+          })
+          .catch(() => {
+            this.loading = false
+            reject()
+          })
       })
     },
     questionGenreChange(val, form) {
@@ -819,17 +923,20 @@ export default {
     parentQuestionChange(val, form) {
       this.isParentExistGroup = false
       if (val) {
-        var index = this.parentOptions.findIndex(item => {
+        var index = this.parentOptions.findIndex((item) => {
           return item.QuestionId === val
         })
         if (index !== -1) {
           if (this.parentOptions[index].QuestionGenre === 3) {
-            this.parentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
+            this.parentTriggerValOptions =
+              this.$d[this.parentOptions[index].DictionaryCode]
           } else {
             var options = []
-            this.parentOptions[index].TypeValue.split('|').forEach((item, index) => {
-              options.push({ id: index, label: item, value: item })
-            })
+            this.parentOptions[index].TypeValue.split('|').forEach(
+              (item, index) => {
+                options.push({ id: index, label: item, value: item })
+              }
+            )
             this.parentTriggerValOptions = options
           }
           if (this.parentOptions[index].GroupName) {
@@ -845,17 +952,20 @@ export default {
     },
     relevanceQuestionChange(val, form) {
       if (val) {
-        var index = this.parentOptions.findIndex(item => {
+        var index = this.parentOptions.findIndex((item) => {
           return item.QuestionId === val
         })
         if (index !== -1) {
           if (this.parentOptions[index].QuestionGenre === 3) {
-            this.reParentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
+            this.reParentTriggerValOptions =
+              this.$d[this.parentOptions[index].DictionaryCode]
           } else {
             var options = []
-            this.parentOptions[index].TypeValue.split('|').forEach((item, index) => {
-              options.push({ id: index, label: item, value: item })
-            })
+            this.parentOptions[index].TypeValue.split('|').forEach(
+              (item, index) => {
+                options.push({ id: index, label: item, value: item })
+              }
+            )
             this.reParentTriggerValOptions = options
           }
         }
@@ -871,23 +981,24 @@ export default {
       return new Promise((resolve, reject) => {
         this.loading = true
         var param = {
-          SystemCriterionId: this.data.ReadingQuestionCriterionSystemId
+          SystemCriterionId: this.data.ReadingQuestionCriterionSystemId,
         }
-        getCriterionLesionType(param).then(res => {
-          this.lesionTypes = res.Result
-          this.loading = false
-          resolve()
-        }).catch(() => {
-          this.loading = false
-          reject()
-        })
+        getCriterionLesionType(param)
+          .then((res) => {
+            this.lesionTypes = res.Result
+            this.loading = false
+            resolve()
+          })
+          .catch(() => {
+            this.loading = false
+            reject()
+          })
       })
     },
     close() {
       this.$emit('close')
-    }
-
-  }
+    },
+  },
 }
 </script>
 <style lang="scss" scoped>
diff --git a/src/views/none-dicom-show/index.vue b/src/views/none-dicom-show/index.vue
index 907afd59..0c5506b7 100644
--- a/src/views/none-dicom-show/index.vue
+++ b/src/views/none-dicom-show/index.vue
@@ -6,54 +6,61 @@
       </div>
       <div class="left-content">
         <!-- 检查层级 -->
-        <div v-for="(study,i) in studyList" :key="study.CodeView">
+        <div v-for="(study, i) in studyList" :key="study.CodeView">
           <div class="study-desc">
             <span>{{ study.CodeView }}</span>
-            <span style="margin:0 5px">{{ study.Modality }}</span>
+            <span style="margin: 0 5px">{{ study.Modality }}</span>
             <span>{{ getBodyPart(study.BodyPart) }}</span>
           </div>
           <!-- 文件层级 -->
-          <div v-if="study.NoneDicomStudyFileList.length === 0" class="empty-text">
+          <div
+            v-if="study.NoneDicomStudyFileList.length === 0"
+            class="empty-text"
+          >
             <slot name="empty">{{ $t('trials:audit:message:noData') }}</slot>
           </div>
-          <div v-else id="imgList" style="height:100%;overflow: hidden">
+          <div v-else id="imgList" style="height: 100%; overflow: hidden">
             <div
-              v-for="(item,j) in study.NoneDicomStudyFileList"
+              v-for="(item, j) in study.NoneDicomStudyFileList"
               :id="`img${item.Id}`"
               :key="item.Id"
               :class="{
-                'is-boxActive': item.Id === currentFileId
+                'is-boxActive': item.Id === currentFileId,
               }"
               class="img-box"
-              @click="selected(item,i,j,true)"
+              @click="selected(item, i, j, true)"
             >
               <div v-if="item.FileName.length < 15" class="img-text">
-                {{ `${j+1}. ${item.FileName}` }}
+                {{ `${j + 1}. ${item.FileName}` }}
               </div>
               <el-tooltip v-else :content="item.FileName" placement="bottom">
                 <div class="img-text">
-                  {{ `${j+1}. ${item.FileName}` }}
+                  {{ `${j + 1}. ${item.FileName}` }}
                 </div>
               </el-tooltip>
             </div>
           </div>
         </div>
       </div>
-
     </el-card>
     <!-- 预览图像 -->
     <el-card class="box-card right">
-      <div style="width:100%;height: 100%;">
-        <Preview v-if="previewImage.imgList.length > 0" ref="previewImage" style="width:100%;" :preview-image="previewImage" :value="currentStudyFileIndex" @selectedImg="selectedImg" />
+      <div style="width: 100%; height: 100%">
+        <Preview
+          v-if="previewImage.imgList.length > 0"
+          ref="previewImage"
+          style="width: 100%"
+          :preview-image="previewImage"
+          :value="currentStudyFileIndex"
+          @selectedImg="selectedImg"
+        />
       </div>
-
     </el-card>
 
     <!-- <el-card class="box-card" style="width:300px;height:100%;padding: 10px;margin-left:10px;">
       <CheckForm />
     </el-card> -->
   </div>
-
 </template>
 
 <script>
@@ -65,7 +72,7 @@ import Preview from './components/preview'
 export default {
   name: 'Notice',
   components: {
-    Preview
+    Preview,
     // CheckForm
   },
   data() {
@@ -82,14 +89,14 @@ export default {
         popup: true, // 弹窗的显示隐藏
         studyCode: '',
         modality: '',
-        bodyPart: ''
+        bodyPart: '',
       },
       previewVisible: false,
       studyList: [],
       subjectVisitId: '',
       sudyId: '',
       loading: false,
-      bp: []
+      bp: [],
     }
   },
   async created() {
@@ -118,8 +125,14 @@ export default {
         separator = '，'
       }
       var arr = bodyPart.split(separator)
-      var newArr = arr.map(i => {
-        return this.$fd('Bodypart', i.trim(), 'Code', { Bodypart: this.bp }, 'Name')
+      var newArr = arr.map((i) => {
+        return this.$fd(
+          'Bodypart',
+          i.trim(),
+          'Code',
+          { Bodypart: this.bp },
+          'Name'
+        )
       })
       console.log(newArr, this.bp)
       return newArr.join(' | ')
@@ -127,22 +140,32 @@ export default {
     // 获取非Dicom检查信息
     getNoneDicomList() {
       this.loading = true
-      getNoneDicomStudyList(this.subjectVisitId, this.studyId).then(res => {
-        this.studyList = res.Result
-        this.loading = false
-        const studyIndex = this.studyList.findIndex(item => {
-          return item.NoneDicomStudyFileList.length > 0
+      getNoneDicomStudyList(
+        this.subjectVisitId,
+        this.studyId,
+        false,
+        this.$route.query.visitTaskId
+      )
+        .then((res) => {
+          this.studyList = res.Result
+          this.loading = false
+          const studyIndex = this.studyList.findIndex((item) => {
+            return item.NoneDicomStudyFileList.length > 0
+          })
+          if (studyIndex > -1) {
+            var fileObj = this.studyList[studyIndex]['NoneDicomStudyFileList']
+            this.selected(fileObj[0], studyIndex, 0, true)
+          }
+        })
+        .catch(() => {
+          this.loading = false
         })
-        if (studyIndex > -1) {
-          var fileObj = this.studyList[studyIndex]['NoneDicomStudyFileList']
-          this.selected(fileObj[0], studyIndex, 0, true)
-        }
-      }).catch(() => { this.loading = false })
     },
     selected(file, studyIndex, fileIndex, isChangeSub = false) {
       this.currentFileId = file.Id
       this.currentStudyIndex = studyIndex
-      this.previewImage.imgList = this.studyList[studyIndex].NoneDicomStudyFileList
+      this.previewImage.imgList =
+        this.studyList[studyIndex].NoneDicomStudyFileList
       this.currentStudyFileIndex = fileIndex
       this.previewImage.index = fileIndex
       this.previewImage.studyCode = this.studyList[studyIndex].CodeView
@@ -157,11 +180,17 @@ export default {
     selectedImg(fileIndex) {
       if (this.studyList.length > 0) {
         this.currentStudyFileIndex = fileIndex
-        this.currentFileId = this.studyList[this.currentStudyIndex].NoneDicomStudyFileList[fileIndex].Id
+        this.currentFileId =
+          this.studyList[this.currentStudyIndex].NoneDicomStudyFileList[
+            fileIndex
+          ].Id
         this.previewImage.index = fileIndex
-        this.previewImage.studyCode = this.studyList[this.currentStudyIndex].CodeView
-        this.previewImage.bodyPart = this.studyList[this.currentStudyIndex].BodyPart
-        this.previewImage.modality = this.studyList[this.currentStudyIndex].Modality
+        this.previewImage.studyCode =
+          this.studyList[this.currentStudyIndex].CodeView
+        this.previewImage.bodyPart =
+          this.studyList[this.currentStudyIndex].BodyPart
+        this.previewImage.modality =
+          this.studyList[this.currentStudyIndex].Modality
         this.$nextTick(() => {
           const target = document.getElementById(`img${this.currentFileId}`)
           const parent = document.getElementsByClassName('left-content')[0]
@@ -171,14 +200,13 @@ export default {
     },
     preview() {
       this.previewVisible = true
-    }
-
-  }
+    },
+  },
 }
 </script>
 
 <style lang="scss" scoped>
-.img-container{
+.img-container {
   position: relative;
   width: 100%;
   height: 100%;
@@ -192,27 +220,27 @@ export default {
     border-radius: 10px;
     background: #d0d0d0;
   }
-  /deep/ .el-card__body{
+  /deep/ .el-card__body {
     padding: 0px;
   }
 }
-.study-desc{
+.study-desc {
   padding: 15px 5px;
   line-height: 20px;
   background-color: #d5d5d5;
   font-weight: 500;
 }
-.left{
-  width:220px;
+.left {
+  width: 220px;
   height: 100%;
 
-  /deep/ .el-card__body{
+  /deep/ .el-card__body {
     height: 100%;
     width: 100%;
     display: flex;
     flex-direction: column;
   }
-  .title{
+  .title {
     height: 40px;
     line-height: 40px;
     border: 1ppx solid;
@@ -221,7 +249,7 @@ export default {
     background-color: #4e4e4e;
     color: #ffffff;
   }
-  .left-content{
+  .left-content {
     flex: 1;
     overflow-y: auto;
   }
@@ -237,7 +265,7 @@ export default {
   //   overflow-y: auto;
   //   padding: 0;
   // }
-  .img-box{
+  .img-box {
     // position: relative;
     display: inline-block;
     box-sizing: border-box;
@@ -246,9 +274,8 @@ export default {
     cursor: pointer;
     // margin-bottom: 5px;
     padding-left: 5px;
-
   }
-  .img-text{
+  .img-text {
     display: inline-block;
     width: 200px;
     height: 50px;
@@ -257,7 +284,7 @@ export default {
     text-overflow: ellipsis; /* 用省略号表示溢出的文本 */
     white-space: nowrap;
   }
-  .img-box:nth-last-child(1){
+  .img-box:nth-last-child(1) {
     margin-bottom: 0px;
   }
   .is-boxActive {
@@ -268,14 +295,13 @@ export default {
     opacity: 0;
   }
 }
-.right{
+.right {
   flex: 1;
   height: 100%;
   margin-left: 10px;
-  /deep/ .el-card__body{
+  /deep/ .el-card__body {
     height: 100%;
     width: 100%;
   }
 }
-
 </style>
diff --git a/src/views/recompose/index.vue b/src/views/recompose/index.vue
index edc686f4..171d78ea 100644
--- a/src/views/recompose/index.vue
+++ b/src/views/recompose/index.vue
@@ -1,76 +1,130 @@
 <template>
-  <div style="display: flex;justify-content: center">
-    <div style="width: 600px;text-align: center;border: 1px solid #e6e6e6;margin-top:40px;padding:10px;">
-      <div class="trial-myinfo-head" style="font-size: 30px;line-height: 120px;">
+  <div style="display: flex; justify-content: center">
+    <div
+      style="
+        width: 600px;
+        text-align: center;
+        border: 1px solid #e6e6e6;
+        margin-top: 40px;
+        padding: 10px;
+      "
+    >
+      <div
+        class="trial-myinfo-head"
+        style="font-size: 30px; line-height: 120px"
+      >
         <!-- 首次登录修改密码 -->
         {{ $t('recompose:title:init') }}
       </div>
-      <el-form ref="passwordForm" v-loading="loading" label-position="right" :model="password" :rules="passwordFormRules" label-width="120px">
+      <el-form
+        ref="passwordForm"
+        v-loading="loading"
+        label-position="right"
+        :model="password"
+        :rules="passwordFormRules"
+        :label-width="$i18n.locale === 'en' ? '180px' : '120px'"
+      >
         <!-- 用户名 -->
         <el-form-item :label="$t('recompose:form:userName')" prop="NewUserName">
           <el-input v-model="password.NewUserName" />
         </el-form-item>
         <!-- 旧密码 -->
-        <el-form-item :label="$t('recompose:form:oldPassword')" prop="OldPassWord">
-          <el-input v-model="password.OldPassWord" type="password" show-password auto-complete="new-password" />
+        <el-form-item
+          :label="$t('recompose:form:oldPassword')"
+          prop="OldPassWord"
+        >
+          <el-input
+            v-model="password.OldPassWord"
+            type="password"
+            show-password
+            auto-complete="new-password"
+          />
         </el-form-item>
         <!-- 新密码 -->
-        <el-form-item :label="$t('recompose:form:newPassword')" prop="NewPassWord">
-          <el-input v-model="password.NewPassWord" type="password" show-password auto-complete="new-password" />
+        <el-form-item
+          :label="$t('recompose:form:newPassword')"
+          prop="NewPassWord"
+        >
+          <el-input
+            v-model="password.NewPassWord"
+            type="password"
+            show-password
+            auto-complete="new-password"
+          />
         </el-form-item>
         <!-- 确认密码 -->
-        <el-form-item :label="$t('recompose:form:confirmPassword')" prop="ConfirmPassWord">
-          <el-input v-model="password.ConfirmPassWord" type="password" show-password auto-complete="new-password" />
+        <el-form-item
+          :label="$t('recompose:form:confirmPassword')"
+          prop="ConfirmPassWord"
+        >
+          <el-input
+            v-model="password.ConfirmPassWord"
+            type="password"
+            show-password
+            auto-complete="new-password"
+          />
         </el-form-item>
-        <el-form-item style="text-align:right">
+        <el-form-item style="text-align: right">
           <!-- 取消 -->
-          <el-button
-            size="small"
-            @click="cancel"
-          >
+          <el-button size="small" @click="cancel">
             {{ $t('recompose:button:cancel') }}
           </el-button>
           <!-- 保存 -->
-          <el-button
-            type="primary"
-            size="small"
-            @click="save"
-          >
+          <el-button type="primary" size="small" @click="save">
             {{ $t('recompose:button:save') }}
           </el-button>
         </el-form-item>
       </el-form>
-
     </div>
   </div>
 </template>
 <script>
 import { modifyPassword } from '@/api/admin.js'
 import md5 from 'js-md5'
-import {mapMutations} from "vuex";
+import { mapMutations } from 'vuex'
 export default {
   data() {
     return {
       password: {
-        NewUserName: null
+        NewUserName: null,
       },
       passwordFormRules: {
-        NewUserName: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }],
-        OldPassWord: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }],
+        NewUserName: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+        ],
+        OldPassWord: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+        ],
         NewPassWord: [
-          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
           {
             required: true,
             trigger: 'blur',
-            validator: this.$validatePassword
+            validator: this.$validatePassword,
           },
         ],
         ConfirmPassWord: [
-          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
-        ]
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+        ],
       },
       userId: null,
-      loading: false
+      loading: false,
     }
   },
   mounted() {
@@ -78,7 +132,6 @@ export default {
     if (!this.password.NewUserName) {
       // 该页面只提供给首次进入系统的用户使用
       this.$alert(this.$t('recompose:message:warning'))
-
     }
   },
   methods: {
@@ -96,7 +149,7 @@ export default {
       this.$updateDictionary()
     },
     save() {
-      this.$refs.passwordForm.validate(valid => {
+      this.$refs.passwordForm.validate((valid) => {
         if (valid) {
           if (this.password.NewPassWord !== this.password.ConfirmPassWord) {
             // 两次密码输入不一致
@@ -106,58 +159,64 @@ export default {
           const param = {
             NewUserName: this.password.NewUserName,
             NewPassWord: md5(this.password.NewPassWord),
-            OldPassWord: md5(this.password.OldPassWord)
+            OldPassWord: md5(this.password.OldPassWord),
           }
           this.loading = true
-          modifyPassword(param).then(res => {
-            this.loading = false
-            if (res.IsSuccess) {
-              // 修改成功,请重新登录账号
-              this.$message.success(this.$t('recompose:message:updatedSuccessfully'))
-              setTimeout(() => {
-                this.logout()
-              }, 500)
-            }
-          }).catch(() => { this.loading = false })
+          modifyPassword(param)
+            .then((res) => {
+              this.loading = false
+              if (res.IsSuccess) {
+                // 修改成功,请重新登录账号
+                this.$message.success(
+                  this.$t('recompose:message:updatedSuccessfully')
+                )
+                setTimeout(() => {
+                  this.logout()
+                }, 500)
+              }
+            })
+            .catch(() => {
+              this.loading = false
+            })
         }
       })
     },
     cancel() {
       this.$refs['passwordForm'].resetFields()
-    }
-  }
+    },
+  },
 }
 </script>
 <style>
-  .reset-wrapper {
-    padding: 20px;
-  }
-  .reset-wrapper .el-page-header {
-    line-height: 50px;
-    border: 1px solid #ebeef5;
-    border-radius: 4px;
-    background-color: #fff;
-  }
-  .reset-wrapper .box-wrapper {
-    width: 60%;
-    margin: 20px auto;
-    padding: 10px;
-    color: #303133;
-  }
+.reset-wrapper {
+  padding: 20px;
+}
+.reset-wrapper .el-page-header {
+  line-height: 50px;
+  border: 1px solid #ebeef5;
+  border-radius: 4px;
+  background-color: #fff;
+}
+.reset-wrapper .box-wrapper {
+  width: 60%;
+  margin: 20px auto;
+  padding: 10px;
+  color: #303133;
+}
 </style>
 <style scoped>
-::v-deep .is-error{
+::v-deep .is-error {
   margin-bottom: 40px;
 }
 input:-webkit-autofill {
   -webkit-text-fill-color: #ededed !important;
-  box-shadow: 0 0 0px 1000px transparent  inset !important;
-  background-color:transparent;
+  box-shadow: 0 0 0px 1000px transparent inset !important;
+  background-color: transparent;
   background-image: none;
   transition: background-color 50000s ease-in-out 0s;
 }
 input {
-  background-color:transparent;
+  background-color: transparent;
   caret-color: #fff;
 }
 </style>
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue
index 1d4e99bf..1502db5e 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue
@@ -473,7 +473,7 @@
           </div>
         </el-tooltip>
         <el-tooltip
-          v-if="trialCriterion.ImageUploadEnum > 0"
+          v-if="trialCriterion.ImageUploadEnum > 0 && !trialCriterion.IsSign"
           v-hasPermi="['role:ir']"
           class="item"
           effect="dark"
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 1685355e..8b1257cc 100644
--- a/src/views/trials/trials-panel/reading/reading-task/index.vue
+++ b/src/views/trials/trials-panel/reading/reading-task/index.vue
@@ -158,7 +158,6 @@
                   <!-- 上传 -->
                   <el-button
                     v-if="
-                      item.CriterionType === 0 &&
                       item.ImageUploadEnum > 0 &&
                       item.IsReadingTaskViewInOrder > 0
                     "
@@ -171,7 +170,6 @@
                   <!-- 下载 -->
                   <el-button
                     v-if="
-                      item.CriterionType === 0 &&
                       item.ImageDownloadEnum === 1 &&
                       item.IsReadingTaskViewInOrder > 0
                     "
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue b/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue
index 888e0d57..8852d0f4 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue
@@ -70,7 +70,7 @@
             :label="item.value"
             v-for="item in $d.YesOrNoModality"
             :key="item.id"
-            >
+          >
             {{ item.label }}
           </el-radio>
         </el-radio-group>
@@ -103,7 +103,7 @@
           @click.stop="handleCheckAllChange"
           type="success"
           >{{
-            $t("trials:readingUnit:readingRules:title:CriterionModalitysAll")
+            $t('trials:readingUnit:readingRules:title:CriterionModalitysAll')
           }}</el-button
         >
       </el-form-item>
@@ -183,7 +183,7 @@
           "
           @change="
             () => {
-              form.IsArbitrationReading = false;
+              form.IsArbitrationReading = false
             }
           "
         >
@@ -233,8 +233,8 @@
           @change="
             (v) => {
               if (!v) {
-                form.IsGlobalReading = v;
-                form.IsOncologyReading = v;
+                form.IsGlobalReading = v
+                form.IsOncologyReading = v
               }
             }
           "
@@ -307,15 +307,15 @@
           "
           @change="
             (v) => {
-              form.ImageDownloadEnum = 0;
-              form.ImageUploadEnum = 0;
+              form.ImageDownloadEnum = 0
+              form.ImageUploadEnum = 0
               if (v) {
-                form.IsReadingShowSubjectInfo = true;
-                form.IsReadingShowPreviousResults = true;
-                form.ReadingTaskViewEnum = 0;
-                form.IseCRFShowInDicomReading = false;
+                form.IsReadingShowSubjectInfo = true
+                form.IsReadingShowPreviousResults = true
+                form.ReadingTaskViewEnum = 0
+                form.IseCRFShowInDicomReading = false
               } else {
-                form.ReadingTaskViewEnum = 2;
+                form.ReadingTaskViewEnum = 2
               }
             }
           "
@@ -352,11 +352,10 @@
           </el-radio>
         </el-radio-group>
       </el-form-item>
-      <!--支持影像下载-->
+      <!--支持影像下载v-if="CriterionType === 0"-->
       <el-form-item
         :label="$t('trials:processCfg:form:ImageDownloadEnum')"
         prop="ImageDownloadEnum"
-        v-if="CriterionType === 0"
       >
         <el-radio-group
           v-model="form.ImageDownloadEnum"
@@ -380,7 +379,6 @@
       <el-form-item
         :label="$t('trials:processCfg:form:ImageUploadEnum')"
         prop="ImageUploadEnum"
-        v-if="CriterionType === 0"
       >
         <el-radio-group
           v-model="form.ImageUploadEnum"
@@ -443,7 +441,7 @@
           @change="
             (v) => {
               if (!v) {
-                form.IseCRFShowInDicomReading = true;
+                form.IseCRFShowInDicomReading = true
               }
             }
           "
@@ -542,7 +540,7 @@
             "
             @change="
               (v) => {
-                $set(form, 'AdditionalAssessmentType' + item.Id, v);
+                $set(form, 'AdditionalAssessmentType' + item.Id, v)
               }
             "
           >
@@ -564,21 +562,21 @@
       >
         <!-- 保存 -->
         <el-button type="primary" @click="handleSave(true)">
-          {{ $t("common:button:save") }}
+          {{ $t('common:button:save') }}
         </el-button>
       </el-form-item>
     </el-form>
   </div>
 </template>
 <script>
-import { getCriterionReadingInfo, setCriterionReadingInfo } from "@/api/trials";
+import { getCriterionReadingInfo, setCriterionReadingInfo } from '@/api/trials'
 export default {
-  name: "ReadingRules",
+  name: 'ReadingRules',
   props: {
     trialReadingCriterionId: {
       type: String,
       default() {
-        return "";
+        return ''
       },
     },
     CriterionType: {
@@ -590,7 +588,7 @@ export default {
     return {
       additionalAssessmentOptionList: [],
       form: {
-        TrialId: "",
+        TrialId: '',
         ImagePlatform: null,
         ReadingTool: 0,
         ReadingTaskViewEnum: null,
@@ -625,151 +623,151 @@ export default {
         IsAutoCreate: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:select"),
-            trigger: ["blur", "change"],
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
           },
         ],
         IsAdditionalAssessment: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:select"),
-            trigger: ["blur", "change"],
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
           },
         ],
         ImagePlatform: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:select"),
-            trigger: ["blur", "change"],
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
           },
         ],
         ReadingTool: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:select"),
-            trigger: ["blur", "change"],
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
           },
         ],
         ImageDownloadEnum: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:select"),
-            trigger: ["blur", "change"],
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
           },
         ],
         ImageUploadEnum: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:select"),
-            trigger: ["blur", "change"],
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
           },
         ],
         IsImageFilter: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:select"),
-            trigger: ["blur", "change"],
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
           },
         ],
         ReadingTaskViewEnum: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:select"),
-            trigger: ["blur", "change"],
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
           },
         ],
         IsImageLabeled: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:select"),
-            trigger: ["blur", "change"],
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
           },
         ],
         IsReadingShowSubjectInfo: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:select"),
-            trigger: ["blur", "change"],
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
           },
         ],
         IsReadingShowPreviousResults: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:select"),
-            trigger: ["blur", "change"],
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
           },
         ],
         ReadingType: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:select"),
-            trigger: ["blur", "change"],
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
           },
         ],
         IsReadingTaskViewInOrder: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:select"),
-            trigger: ["blur", "change"],
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
           },
         ],
         IsGlobalReading: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:select"),
-            trigger: ["blur", "change"],
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
           },
         ],
         IsArbitrationReading: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:select"),
-            trigger: ["blur", "change"],
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
           },
         ],
         IsOncologyReading: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:select"),
-            trigger: ["blur", "change"],
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
           },
         ],
         DigitPlaces: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:select"),
-            trigger: ["blur", "change"],
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
           },
         ],
         IseCRFShowInDicomReading: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:select"),
-            trigger: ["blur", "change"],
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
           },
         ],
         IsReadingPeriod: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:select"),
-            trigger: ["blur", "change"],
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
           },
         ],
         CriterionModalitys: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:select"),
-            trigger: ["blur", "change"],
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
           },
           {
             validator: (rule, value, callback) => {
               if (value && Array.isArray(value) && value.length < 0) {
-                callback(new Error(this.$t("common:ruleMessage:select")));
+                callback(new Error(this.$t('common:ruleMessage:select')))
               } else {
-                callback();
+                callback()
               }
             },
-            trigger: ["blur", "change"],
+            trigger: ['blur', 'change'],
           },
         ],
         // IsReadingTaskViewInOrder: [
@@ -786,15 +784,15 @@ export default {
       modalityList: [],
       CriterionModalitys: [],
       modalityIsCheck: false, // 是否允许影像筛选
-    };
+    }
   },
   mounted() {
-    this.initPage();
+    this.initPage()
   },
   watch: {
     CriterionModalitys: {
       handler() {
-        this.form.CriterionModalitys = this.CriterionModalitys.join("|");
+        this.form.CriterionModalitys = this.CriterionModalitys.join('|')
       },
       deep: true,
     },
@@ -803,19 +801,19 @@ export default {
     // 检查类型筛选值变更
     IsImageFilterChange(data) {
       if (data) {
-        this.CriterionModalitys = this.modalityList;
+        this.CriterionModalitys = this.modalityList
       } else {
-        this.CriterionModalitys = [];
+        this.CriterionModalitys = []
       }
     },
     // 影像模态全选
     handleCheckAllChange() {
       this.CriterionModalitys =
-        this.CriterionModalitys.length <= 0 ? this.modalityList : [];
+        this.CriterionModalitys.length <= 0 ? this.modalityList : []
     },
     initPage() {
-      this.loading = true;
-      const trialId = this.$route.query.trialId;
+      this.loading = true
+      const trialId = this.$route.query.trialId
       // getTrialCriterionAdditionalAssessmentOptionList(this.trialReadingCriterionId).then(res => {
       //   this.additionalAssessmentOptionList = res.Result
       //   if (this.additionalAssessmentOptionList.length > 0) {
@@ -828,46 +826,46 @@ export default {
         TrialReadingCriterionId: this.trialReadingCriterionId,
       })
         .then((res) => {
-          this.loading = false;
-          this.modalityList = res.Result.TrialModalitys.split("|").filter(
+          this.loading = false
+          this.modalityList = res.Result.TrialModalitys.split('|').filter(
             (item) => item && item.trim()
-          );
+          )
           for (const k in this.form) {
             if (res.Result.hasOwnProperty(k)) {
-              this.form[k] = res.Result[k];
+              this.form[k] = res.Result[k]
             }
           }
           this.CriterionModalitys = this.form.CriterionModalitys
-            ? this.form.CriterionModalitys.split("|")
-            : [];
+            ? this.form.CriterionModalitys.split('|')
+            : []
           this.form.TrialCriterionAdditionalAssessmentTypeList.forEach((v) => {
-            this.$set(v, "IsSelected", v.IsSelected || false);
+            this.$set(v, 'IsSelected', v.IsSelected || false)
             this.$set(
               this.form,
-              "AdditionalAssessmentType" + v.Id,
+              'AdditionalAssessmentType' + v.Id,
               v.IsSelected
-            );
-          });
-          this.isReadingTaskViewInOrder = res.Result.IsReadingTaskViewInOrder;
-          this.isConfirm = res.Result.IsSign;
-          this.IsMustGlobalReading = res.Result.IsMustGlobalReading;
-          this.$emit("setConfirm", res.Result.IsSign);
-          this.$emit("setArbitrationReading", res.Result.IsArbitrationReading);
+            )
+          })
+          this.isReadingTaskViewInOrder = res.Result.IsReadingTaskViewInOrder
+          this.isConfirm = res.Result.IsSign
+          this.IsMustGlobalReading = res.Result.IsMustGlobalReading
+          this.$emit('setConfirm', res.Result.IsSign)
+          this.$emit('setArbitrationReading', res.Result.IsArbitrationReading)
           this.$emit(
-            "setAdditionalAssessment",
+            'setAdditionalAssessment',
             this.form.IsAdditionalAssessment
-          );
-          this.$emit("setIsClinicalReading", res.Result.IsClinicalReading);
-          this.$emit("setGlobalReading", res.Result.IsGlobalReading);
-          this.$emit("setOncologyReading", res.Result.IsOncologyReading);
-          this.$emit("setDigitPlaces", res.Result.DigitPlaces);
+          )
+          this.$emit('setIsClinicalReading', res.Result.IsClinicalReading)
+          this.$emit('setGlobalReading', res.Result.IsGlobalReading)
+          this.$emit('setOncologyReading', res.Result.IsOncologyReading)
+          this.$emit('setDigitPlaces', res.Result.DigitPlaces)
           if (res.Result.ReadingType === 1) {
-            this.$emit("setArbitrationReading", false);
+            this.$emit('setArbitrationReading', false)
           }
         })
         .catch(() => {
-          this.loading = false;
-        });
+          this.loading = false
+        })
       // }).catch(() => {
       //   this.loading = false
       // })
@@ -875,52 +873,52 @@ export default {
     // 配置信息保存
     handleSave(isPrompt = true) {
       return new Promise((resolve, reject) => {
-        this.$refs["readingRulesForm"].validate((valid) => {
+        this.$refs['readingRulesForm'].validate((valid) => {
           if (!valid) {
-            resolve(false);
+            resolve(false)
           } else {
-            this.loading = true;
+            this.loading = true
             if (this.form.ReadingType === 1) {
-              this.form.IsArbitrationReading = false;
+              this.form.IsArbitrationReading = false
             }
             // 保存配置信息
-            this.form.TrialReadingCriterionId = this.trialReadingCriterionId;
+            this.form.TrialReadingCriterionId = this.trialReadingCriterionId
             setCriterionReadingInfo(this.form)
               .then((res) => {
-                this.loading = false;
-                this.$emit("reloadArbitrationRules");
+                this.loading = false
+                this.$emit('reloadArbitrationRules')
                 this.$emit(
-                  "setArbitrationReading",
+                  'setArbitrationReading',
                   this.form.IsArbitrationReading
-                );
+                )
                 this.$emit(
-                  "setAdditionalAssessment",
+                  'setAdditionalAssessment',
                   this.form.IsAdditionalAssessment
-                );
-                this.$emit("setIsClinicalReading", this.form.IsClinicalReading);
-                this.$emit("setGlobalReading", this.form.IsGlobalReading);
-                this.$emit("setOncologyReading", this.form.IsOncologyReading);
-                this.$emit("setDigitPlaces", this.form.DigitPlaces);
+                )
+                this.$emit('setIsClinicalReading', this.form.IsClinicalReading)
+                this.$emit('setGlobalReading', this.form.IsGlobalReading)
+                this.$emit('setOncologyReading', this.form.IsOncologyReading)
+                this.$emit('setDigitPlaces', this.form.DigitPlaces)
                 if (this.form.ReadingType === 1) {
-                  this.$emit("setArbitrationReading", false);
+                  this.$emit('setArbitrationReading', false)
                 }
                 if (res.IsSuccess && isPrompt) {
                   this.$message.success(
-                    this.$t("common:message:savedSuccessfully")
-                  );
+                    this.$t('common:message:savedSuccessfully')
+                  )
                 }
-                resolve(true);
+                resolve(true)
               })
               .catch((_) => {
-                this.loading = false;
-                resolve(false);
-              });
+                this.loading = false
+                resolve(false)
+              })
           }
-        });
-      });
+        })
+      })
     },
   },
-};
+}
 </script>
 <style lang="scss" scoped>
 .reading-rule-config-form {
diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadClinicalData.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadClinicalData.vue
index 009a901c..99f4d1d8 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadClinicalData.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadClinicalData.vue
@@ -252,7 +252,7 @@
         </div>
         <!-- PDF录入 -->
         <div v-if="cd.ClinicalUploadType === 1">
-          <div v-if="allowAddOrEdit" style="text-align: right">
+          <div v-if="allowAddOrEdit" style="display:flex;align-items:center;justify-content: flex-end;">
             <!-- 下载模板 -->
             <el-button
               v-if="cd.Path"
@@ -271,6 +271,7 @@
                 position: relative;
                 overflow: hidden;
                 display: inline-block;
+                margin-left:10px
               "
             >
               <!-- 新增 -->
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 267bb120..894a0487 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
@@ -1,9 +1,12 @@
 <template>
   <div class="upload-dicom-files-wrapper">
     <!-- 已上传的dicom影像记录 -->
-    <el-divider content-position="left">{{
+    <!-- <el-divider content-position="left">{{
       $t('trials:uploadedDicoms:title:dicomUploaded')
-    }}</el-divider>
+    }}</el-divider> -->
+    <div style="margin: 10px 0">
+      {{ $t('trials:uploadedDicoms:title:dicomUploaded') }}
+    </div>
     <div class="functions" style="text-align: right">
       <!-- //批量删除已上传的影像 -->
       <el-button
@@ -193,9 +196,12 @@
       </el-table-column>
     </el-table>
     <!-- 多文件上传 -->
-    <el-divider content-position="left">{{
+    <!-- <el-divider content-position="left">{{
       $t('trials:uploadedDicoms:title:dicomFilesOnly')
-    }}</el-divider>
+    }}</el-divider> -->
+    <div style="margin: 30px 0 10px 0">
+      {{ $t('trials:uploadedDicoms:title:dicomFilesOnly') }}
+    </div>
     <el-tabs v-model="uploadActiveName">
       <!-- 本地上传 -->
       <el-tab-pane
@@ -539,10 +545,11 @@
                 icon="el-icon-view"
                 circle
                 :disabled="
-                  scope.row.uploadState.stateCode !== '' &&
-                  scope.row.dicomInfo.failedFileCount <
-                    scope.row.dicomInfo.fileCount &&
-                  !scope.row.uploadState.record
+                  (scope.row.uploadState.stateCode !== '' &&
+                    scope.row.dicomInfo.failedFileCount <
+                      scope.row.dicomInfo.fileCount &&
+                    !scope.row.uploadState.record) ||
+                  btnLoading
                 "
                 :title="$t('trials:uploadedDicoms:action:preview')"
                 size="small"
@@ -555,10 +562,11 @@
                 :title="$t('trials:uploadedDicoms:action:delete')"
                 size="small"
                 :disabled="
-                  scope.row.uploadState.stateCode !== '' &&
-                  scope.row.dicomInfo.failedFileCount <
-                    scope.row.dicomInfo.fileCount &&
-                  !scope.row.uploadState.record
+                  (scope.row.uploadState.stateCode !== '' &&
+                    scope.row.dicomInfo.failedFileCount <
+                      scope.row.dicomInfo.fileCount &&
+                    !scope.row.uploadState.record) ||
+                  btnLoading
                 "
                 @click="handleDelete(scope.$index, scope.row)"
               />
@@ -1076,7 +1084,7 @@ export default {
     // 按序列UUID本地归档
     parseDicomFile(file) {
       var scope = this
-      return new Promise(function (resolve, reject) { 
+      return new Promise(function (resolve, reject) {
         if (scope.scanState === 'cancelling') {
           resolve()
           return
diff --git a/vue.config.js b/vue.config.js
index ea3e8bf9..f7fb01e5 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -24,10 +24,10 @@ module.exports = {
   productionSourceMap: false,
   devServer: {
     port: '8080',
-    headers: {
-      'Cross-Origin-Opener-Policy': 'same-origin',
-      'Cross-Origin-Embedder-Policy': 'require-corp'
-    },
+    // headers: {
+    //   'Cross-Origin-Opener-Policy': 'same-origin',
+    //   'Cross-Origin-Embedder-Policy': 'require-corp'
+    // },
     // open: true,
     overlay: {
       warnings: false,