Merge branch 'uat' into uat_us

# Conflicts: # vue.config.js
代码合并
2026-03-05 10:22:00 +08:00 · 2026-03-03 14:15:04 +08:00 · 2026-03-03 14:14:46 +08:00 · 2026-03-03 13:54:59 +08:00 · 2026-03-03 12:41:50 +08:00 · 2026-03-03 11:36:36 +08:00
251 changed files with 27750 additions and 15795 deletions
--- a/irc_vue_drone.yml
+++ b/irc_vue_drone.yml
@ -1,31 +1,3 @@
-kind: pipeline
-type: ssh
-name: ssh-linux-uat-irc-publish
-
-platform:
-  os: Linux
-  arch: 386
-  
-clone:
-  disable: true  #禁用默认克隆
-  
-server:
-  host: 47.117.164.182
-  user: root
-  password:
-    from_secret: local_pwd
-
-steps:
- name: uat-branch-publish-irc-vue
-  commands:
-  - cd /opt/1panel/vue-devops/Uat_IRC/Uat-To-Uat
-  - sh uat-to-uat.sh v${DRONE_BUILD_NUMBER}
-  
-trigger:
-  branch:
-    - uat    
-    
---    

 kind: pipeline
 type: ssh
@ -45,12 +17,17 @@ server:
    from_secret: local_pwd

 steps:
- name: publish-test-irc-vue
+  - name: publish-test-irc-web
    commands:
-  - echo start publish test-irc-vue
-  - cd /opt/1panel/hang/vue/test-irc
-  - sh test-irc.sh v${DRONE_BUILD_NUMBER}
-  
+      - bash /opt/1panel/xc-deploy-new/devops-center/build-vue-then-publish.sh  IRC_Web main
+  - name: notify-wecom
+    commands:
+      - echo $DRONE_COMMIT_AUTHOR "$DRONE_COMMIT_MESSAGE"
+      - bash /opt/1panel/xc-deploy-new/devops-center/drone-notify-wecom.sh "$DRONE_BUILD_STATUS" "$DRONE_REPO_NAME" "$DRONE_BRANCH" "$DRONE_BUILD_NUMBER" "4355b98e-1e72-4678-8dfb-2fc6ad0bf449" "$DRONE_COMMIT_MESSAGE" "$DRONE_COMMIT_AUTHOR" "Test_IRC_WEB" "irc.test.extimaging.com"
+    when:
+      status:
+        - success
+        - failure
 trigger:
  branch:
    - main    
--- a/package.json
+++ b/package.json
@ -21,6 +21,7 @@
    "@cornerstonejs/core": "^2.19.7",
    "@cornerstonejs/dicom-image-loader": "^2.19.7",
    "@cornerstonejs/tools": "^2.19.7",
+    "@fingerprintjs/fingerprintjs": "^4.6.2",
    "@icr/polyseg-wasm": "^0.4.0",
    "@microsoft/signalr": "^8.0.7",
    "@riophae/vue-treeselect": "^0.4.0",
--- a/public/cease.html
+++ b/public/cease.html
@ -10,7 +10,7 @@
    <meta http-equiv="Pragma" content="no-cache">
    <meta http-equiv="Cache-control" content="no-store,no-cache,must-revalidate">
    <meta http-equiv="Cache" content="no-cache">
-    <title>IRC Imaging System</title>
+    <title>EIC lmaging Trial Management System</title>
 </head>

 <body>
--- a/public/error.html
+++ b/public/error.html
@ -31,7 +31,7 @@
            <div class="title-container" style="display: flex;padding-top:180px;justify-content: flex-start;height: 100%;box-sizing: border-box">
              <!-- IRC Management System -->
 <!--              <div class="title" style="text-align: center;font-size: 28px;margin-top: 100px;padding-right: 120px"></div>-->
-<!--              <div class="title" v-show="false">IRC Imaging System</div>-->
+<!--              <div class="title" v-show="false">EIC lmaging Trial Management System</div>-->
              <div style="color: #0a84ff;text-align: left;font-size: 28px">
                {{message}}
              </div>
@ -63,7 +63,7 @@
          <div style="margin: 0 auto;width: 600px;line-height: 28px;text-align: center" >
            <h1 style="text-align: center;margin-bottom: 20px">关于</h1>
            <p style="margin-bottom: 20px">
-              IRC Imaging System
+              EIC lmaging Trial Management System
            </p>
            <p style="margin-bottom: 20px">
              V1.3.0.001
--- a/public/errorEN.html
+++ b/public/errorEN.html
@ -31,7 +31,7 @@
        <div class="title-container" style="display: flex;padding-top:180px;justify-content: flex-start;height: 100%;box-sizing: border-box">
          <!-- IRC Management System -->
          <!--              <div class="title" style="text-align: center;font-size: 28px;margin-top: 100px;padding-right: 120px"></div>-->
-          <!--              <div class="title" v-show="false">IRC Imaging System</div>-->
+          <!--              <div class="title" v-show="false">EIC lmaging Trial Management System</div>-->
          <div style="color: #0a84ff;text-align: left;font-size: 28px">
            {{message}}
          </div>
--- a/public/screen.pdf
+++ b/public/screen.pdf
--- a/src/App.vue
+++ b/src/App.vue
@ -1,12 +1,7 @@
 <template>
  <div id="app" style="position: relative">
    <router-view />
-    <div
-      v-show="show"
-      v-if="$route.matched.length > 0"
-      v-adaptive
-      @click="openI18n"
-      style="
+    <div v-show="show" v-if="$route.matched.length > 0" v-adaptive @click="openI18n" style="
        position: fixed;
        bottom: 50px;
        left: 50px;
@ -19,58 +14,27 @@
        color: #fff;
        border-radius: 50%;
        cursor: pointer;
-      "
-    >
+      ">
      i18n
    </div>
-    <el-drawer
-      :title="$t('il8n:title')"
-      :visible.sync="drawer"
-      direction="rtl"
-      size="80%"
-    >
+    <el-drawer :title="$t('il8n:title')" :visible.sync="drawer" direction="rtl" size="80%">
      <div style="width: 800px">
-        <el-form
-          label-width="100px"
-          @submit.native.prevent
-          size="small"
-          :inline="true"
-          class="demo-form-inline"
-        >
+        <el-form label-width="100px" @submit.native.prevent size="small" :inline="true" class="demo-form-inline">
          <el-form-item :label="$t('il8n:search:keyword')">
            <el-input v-model="key" @input="keyChange" />
          </el-form-item>
          <el-form-item :label="$t('il8n:search:state')">
-            <el-select
-              v-model="State"
-              clearable
-              filterable
-              @change="handleStateChange"
-            >
-              <el-option
-                v-for="item of $d.InternationalizationKeyState"
-                :key="'InternationalizationKeyState' + item.value"
-                :label="item.label"
-                :value="item.value"
-              />
+            <el-select v-model="State" clearable filterable @change="handleStateChange">
+              <el-option v-for="item of $d.InternationalizationKeyState"
+                :key="'InternationalizationKeyState' + item.value" :label="item.label" :value="item.value" />
            </el-select>
          </el-form-item>
        </el-form>
      </div>
-      <el-table
-        :data="tableData"
-        v-adaptive="{ bottomOffset: 50 }"
-        height="100"
-        style="width: 100%"
-        @sort-change="handleSortByColumn"
-      >
-        <el-table-column
-          prop="Code"
-          :label="$t('il8n:table:label')"
-          width="300"
-          show-overflow-tooltip
-          sortable="custom"
-        >
+      <el-table :data="tableData" v-adaptive="{ bottomOffset: 50 }" height="100" style="width: 100%"
+        @sort-change="handleSortByColumn">
+        <el-table-column prop="Code" :label="$t('il8n:table:label')" width="300" show-overflow-tooltip
+          sortable="custom">
        </el-table-column>
        <!--        <el-table-column-->
        <!--          prop="Description"-->
@ -81,71 +45,37 @@
        <!--            {{scope.row.Description}}-->
        <!--          </template>-->
        <!--        </el-table-column>-->
-        <el-table-column
-          prop="Value"
-          :label="$t('il8n:table:en')"
-          sortable="custom"
-        >
+        <el-table-column prop="Value" :label="$t('il8n:table:en')" sortable="custom">
          <template slot-scope="scope">
-            <el-input
-              v-model="scope.row.Value"
-              @input="
+            <el-input v-model="scope.row.Value" @input="
              (e) => {
                $set(scope.row, 'Value', e)
              }
-              "
-              size="mini"
-            ></el-input>
+            " size="mini"></el-input>
          </template>
        </el-table-column>
-        <el-table-column
-          prop="ValueCN"
-          :label="$t('il8n:table:cn')"
-          sortable="custom"
-        >
+        <el-table-column prop="ValueCN" :label="$t('il8n:table:cn')" sortable="custom">
          <template slot-scope="scope">
-            <el-input
-              v-model="scope.row.ValueCN"
-              @input="
+            <el-input v-model="scope.row.ValueCN" @input="
              (e) => {
                $set(scope.row, 'ValueCN', e)
              }
-              "
-              size="mini"
-            ></el-input>
+            " size="mini"></el-input>
          </template>
        </el-table-column>
-        <el-table-column
-          prop="ValueCN"
-          :label="$t('il8n:table:state')"
-          sortable="custom"
-        >
+        <el-table-column prop="ValueCN" :label="$t('il8n:table:state')" sortable="custom">
          <template slot-scope="scope">
-            <el-select
-              v-model="scope.row.State"
-              clearable
-              filterable
-              size="mini"
-            >
-              <el-option
-                v-for="item of $d.InternationalizationKeyState"
-                :key="'InternationalizationKeyState' + item.value"
-                :label="item.label"
-                :value="item.value"
-              />
+            <el-select v-model="scope.row.State" clearable filterable size="mini">
+              <el-option v-for="item of $d.InternationalizationKeyState"
+                :key="'InternationalizationKeyState' + item.value" :label="item.label" :value="item.value" />
            </el-select>
          </template>
        </el-table-column>
-        <el-table-column
-          prop="Version"
-          :label="$t('il8n:table:Version')"
-          sortable="custom"
-        >
+        <el-table-column prop="Version" :label="$t('il8n:table:Version')" sortable="custom">
        </el-table-column>
      </el-table>
      <div style="text-align: right; padding-top: 10px; padding-right: 10px">
-        <el-button size="mini" @click="drawer = false"
-          >{{ $t('common:button:cancel') }}
+        <el-button size="mini" @click="drawer = false">{{ $t('common:button:cancel') }}
        </el-button>
        <el-button size="mini" type="primary" @click="handleSave">{{
          $t('common:button:save')
@ -153,6 +83,7 @@
      </div>
    </el-drawer>
    <feedBack v-if="$route.matched.length > 0" />
+    <!-- <timeTag /> -->
  </div>
 </template>

@ -163,11 +94,15 @@ import {
 } from '@/api/dictionary/dictionary'
 import { getTrialExtralConfig } from '@/api/trials'
 import feedBack from '@/views/trials/trials-layout/components/feedBack'
+// import timeTag from '@/components/timeTag'
 import Vue from 'vue'
 import i18n from './lang'
 export default {
  name: 'App',
-  components: { feedBack },
+  components: {
+    feedBack,
+    // timeTag
+  },
  data() {
    return {
      drawer: false,
@ -180,7 +115,8 @@ export default {
    }
  },
  mounted() {
-    this.show = process.env.VUE_APP_OSS_PATH === '/test/dist'
+    // this.show = process.env.VUE_APP_OSS_PATH === '/test/dist'
+    this.show = false
    Vue.prototype.$openI18n = this.openI18n
  },
  // watch: {
@ -366,13 +302,16 @@ export default {

 <style lang="scss">
 $light_gray: #606266;
+
 .el-tooltip__popper {
  max-width: 400px;
 }
+
 .my_multiple {
  .el-input--medium .el-input__inner {
    height: 36px !important;
  }
+
  .el-select__tags {
    flex-wrap: nowrap;
    overflow: hidden;
@ -381,6 +320,7 @@ $light_gray: #606266;
    display: block;
  }
 }
+
 input::-webkit-outer-spin-button,
 input::-webkit-inner-spin-button {
  -webkit-appearance: none !important;
@ -393,6 +333,7 @@ input[type='number'] {
 .viewer-fixed.viewer-container {
  z-index: 10000;
 }
+
 textarea {
  white-space: break-spaces;
  word-break: normal;
@ -401,12 +342,15 @@ textarea {
 * {
  word-break: normal !important;
 }
+
 .box-body .el-button.is-circle:not(.is-disabled) i:before {
  color: #428bca;
 }
+
 .box-body .el-button.is-circle i.el-icon-question:before {
  color: #fff;
 }
+
 .system-title {
  font-size: 35px;
  color: $light_gray;
@ -415,9 +359,11 @@ textarea {
  font-family: 'Times New Roman';
  text-shadow: 1px 0.5px 1.5px #666;
 }
+
 .title-logo {
  height: 40px;
 }
+
 .title-logo {
  height: 40px;
 }
--- a/src/api/admin.js
+++ b/src/api/admin.js
@ -89,10 +89,11 @@ export function UpdateUserRole(param) {
  })
 }

-export function resetPassword(userId) {
+export function resetPassword(data) {
  return request({
-    url: `/user/resetPassword/${userId}`,
-    method: 'get'
+    url: `/user/resetPassword`,
+    method: 'post',
+    data
  })
 }

@ -350,3 +351,43 @@ export function getUserJoinedTrialList(data) {
    data
  })
 }
+// 邮件日志-日志列表
+export function getEmailLogList(data) {
+  return request({
+    url: `/EmailLog/getEmailLogList`,
+    method: 'post',
+    data
+  })
+}
+// 邮件日志-日志详情
+export function getEmailInfo(data) {
+  return request({
+    url: `/EmailLog/getEmailInfo`,
+    method: 'post',
+    data
+  })
+}
+// 邮件日志-重发邮件
+export function resendEmail(data) {
+  return request({
+    url: `/EmailLog/resendEmail`,
+    method: 'post',
+    data
+  })
+}
+// 邮件日志-同步邮件
+export function synchronizationEmail(data) {
+  return request({
+    url: `/EmailLog/synchronizationEmail`,
+    method: 'post',
+    data
+  })
+}
+// 邮件日志-重发列表
+export function getReSendEmail(data) {
+  return request({
+    url: `/EmailLog/getReSendEmail`,
+    method: 'post',
+    data
+  })
+}
--- a/src/api/dictionary.js
+++ b/src/api/dictionary.js
@ -1403,3 +1403,74 @@ export function batchUpdateEmail(data) {
    data
  })
 }
+
+// 隐私政策和用户协议-获取列表
+export function getUserAgreementList(data) {
+  return request({
+    url: `/UserAgreement/getUserAgreementList`,
+    method: 'post',
+    data
+  })
+}
+// 隐私政策和用户协议-设置当前版本
+export function setCurrentVersion(data) {
+  return request({
+    url: `/UserAgreement/setCurrentVersion`,
+    method: 'post',
+    data
+  })
+}
+// 隐私政策和用户协议-新增或修改
+export function addOrUpdateUserAgreement(data) {
+  return request({
+    url: `/UserAgreement/addOrUpdateUserAgreement`,
+    method: 'post',
+    data
+  })
+}
+// 隐私政策和用户协议-删除
+export function deleteUserAgreement(id) {
+  return request({
+    url: `/UserAgreement/deleteUserAgreement/${id}`,
+    method: 'delete',
+  })
+}
+// 隐私政策和用户协议-详情
+export function getUserAgreementById(data) {
+  return request({
+    url: `/UserAgreement/getUserAgreementById`,
+    method: 'post',
+    data
+  })
+}
+// 隐私政策和用户协议-当前版本
+export function getCurrentVersionUserAgreements(data) {
+  return request({
+    url: `/UserAgreement/getCurrentVersionUserAgreements`,
+    method: 'post',
+    data
+  })
+}
+// 获取系统阅片关键点文件列表
+export function getSystemCriterionKeyFileList(data) {
+  return request({
+    url: `/SystemCriterionKeyFile/getSystemCriterionKeyFileList`,
+    method: 'post',
+    data
+  })
+}
+// 新增/修改系统阅片关键点文件
+export function addOrUpdateSystemCriterionKeyFile(data) {
+  return request({
+    url: `/SystemCriterionKeyFile/addOrUpdateSystemCriterionKeyFile`,
+    method: 'post',
+    data
+  })
+}
+// 删除系统阅片关键点文件
+export function deleteSystemCriterionKeyFile(systemCriterionKeyFileId) {
+  return request({
+    url: `/SystemCriterionKeyFile/deleteSystemCriterionKeyFile/${systemCriterionKeyFileId}`,
+    method: 'delete'
+  })
+}
--- a/src/api/export.js
+++ b/src/api/export.js
@ -239,6 +239,14 @@ export function getPatientList_Export(data) {
    data
  })
 }
+export function getTumor_CDISC_IVUSOCT_Export(data) {
+  return requestDownload({
+    url: `/IVUS_OCTExport/getTumor_CDISC_Export`,
+    responseType: 'blob',
+    method: 'post',
+    data
+  })
+}
 export function getCommonEvaluationList_Export(data) {
  return requestDownload({
    url: `/ExcelExport/getCommonEvaluationList_Export`,
@ -255,6 +263,14 @@ export function getCommonJudgeRatioList_Export(data) {
    data
  })
 }
+export function getTumor_CDISC_Export(data) {
+  return requestDownload({
+    url: `/Tumor_CDISC_Export/getTumor_CDISC_Export`,
+    responseType: 'blob',
+    method: 'post',
+    data
+  })
+}
 // 导出国际化列表
 export function GetInternationalizationList_Export(data) {
  return requestDownload({
--- a/src/api/reading.js
+++ b/src/api/reading.js
@ -294,3 +294,28 @@ export function readingImport(param) {
    data: param
  })
 }
+
+// 非dicom阅片保存标记
+export function saveAnswerAndBindingNoneDicomMark(param) {
+  return request({
+    url: `/ReadingImageTask/saveAnswerAndBindingNoneDicomMark`,
+    method: 'post',
+    data: param
+  })
+}
+// 非dicom按比例修改答案
+export function changePlottingScaleChangeAnswer(param) {
+  return request({
+    url: `/ReadingImageTask/changePlottingScaleChangeAnswer`,
+    method: 'post',
+    data: param
+  })
+}
+// 阅片获取图表数据
+export function getReportsChartData(param) {
+  return request({
+    url: `/ReadingImageTask/getReportsChartData`,
+    method: 'post',
+    data: param
+  })
+}
--- a/src/api/research.js
+++ b/src/api/research.js
@ -26,8 +26,11 @@ export function getTrialSurveyInitInfo(trialId) {

 export function getSiteSurveyInfo(trialId, id) {
  return request({
-    url: `/TrialSiteSurvey/getSiteSurveyInfo/${trialId}/${id}`,
-    method: 'get'
+    url: `/TrialSiteSurvey/getSiteSurveyInfo/${trialId}`,
+    method: 'get',
+    params: {
+      TrialsiteSurveyId: id
+    }
  })
 }

--- a/src/api/trials.js
+++ b/src/api/trials.js
@ -1203,7 +1203,13 @@ export function getConsistencyVerificationList(param) {
    data: param
  })
 }
-
+export function getConsistencyCheckFileList(param) {
+  return request({
+    url: `/QCList/getConsistencyCheckFileList`,
+    method: 'post',
+    data: param
+  })
+}
 export function getCheckChallengeDialogList(subjectVisitId) {
  return request({
    url: `/QCList/getCheckChallengeDialogList/${subjectVisitId}`,
@ -1256,11 +1262,11 @@ export function getCRCVisitChallengeAndDialog(subjectVisitId, trialQCProcess) {
  })
 }

-export function uploadVisitCheckExcel(trialId, file) {
+export function uploadVisitCheckExcel(trialId, file, isFullCheck = false) {
  const formData = new FormData()
  formData.append('file', file)
  return request({
-    url: `/QCOperation/UploadVisitCheckExcel/${trialId}`,
+    url: `/QCOperation/UploadVisitCheckExcel/${trialId}?isFullCheck=${isFullCheck}`,
    method: 'post',
    data: formData
  })
@ -1405,9 +1411,9 @@ export function getForwardList(param) {
  })
 }

-export function getNoneDicomStudyList(subjectVisitId, sudyId = '', isFilterZip = false, visitTaskId = '', IsReading = false) {
+export function getNoneDicomStudyList(subjectVisitId, sudyId = '', isFilterZip = false, visitTaskId = '', IsReading = false, isImageSegmentLabel = '') {
  return request({
-    url: `/NoneDicomStudy/getNoneDicomStudyList?subjectVisitId=${subjectVisitId}&nonedicomStudyId=${sudyId}&isFilterZip=${isFilterZip}&visitTaskId=${visitTaskId}&IsReading=${IsReading}`,
+    url: `/NoneDicomStudy/getNoneDicomStudyList?isImageSegmentLabel=${isImageSegmentLabel}&subjectVisitId=${subjectVisitId}&nonedicomStudyId=${sudyId}&isFilterZip=${isFilterZip}&visitTaskId=${visitTaskId}&IsReading=${IsReading}`,
    method: 'get'
  })
 }
@ -2833,7 +2839,13 @@ export function getSplitPPdSum(param) {
    data: param
  })
 }
-
+export function getSplitPPdSumNoPet(param) {
+  return request({
+    url: `/LuganoWithoutPETCalculate/getSplitPPdSum`,
+    method: 'post',
+    data: param
+  })
+}
 export function submitDicomVisitTask(param) {
  return request({
    url: `/Inspection/ReadingImageTask/SubmitDicomVisitTask`,
@ -2872,7 +2884,13 @@ export function getIsSuvMaxLesion(param) {
    data: param
  })
 }
-
+export function getIsSuvMaxLesionNoPet(param) {
+  return request({
+    url: `/LuganoWithoutPETCalculate/getIsSuvMaxLesion`,
+    method: 'post',
+    data: param
+  })
+}
 export function getCanChooseNotMerge(param) {
  return request({
    url: `/LuganoCalculate/getCanChooseNotMerge`,
@ -2880,6 +2898,13 @@ export function getCanChooseNotMerge(param) {
    data: param
  })
 }
+export function getCanChooseNotMergeNoPet(param) {
+  return request({
+    url: `/LuganoWithoutPETCalculate/getCanChooseNotMerge`,
+    method: 'post',
+    data: param
+  })
+}
 export function saveTaskQuestion(saveQuestionType, param) {
  return request({
    url: `/SaveTaskQuestion/${saveQuestionType}`,
@ -3603,13 +3628,24 @@ export function getSplenicState(visitTaskId, spleenLength) {
    method: 'post'
  })
 }
-
+export function getSplenicStateNoPet(visitTaskId, spleenLength) {
+  return request({
+    url: `/LuganoWithoutPETCalculate/getSplenicState?visitTaskId=${visitTaskId}&spleenLength=${spleenLength}`,
+    method: 'post'
+  })
+}
 export function getSplenicVerify(visitTaskId) {
  return request({
    url: `/LuganoCalculate/getSplenicVerify?visitTaskId=${visitTaskId}`,
    method: 'post'
  })
 }
+export function getSplenicVerifyNoPet(visitTaskId) {
+  return request({
+    url: `/LuganoWithoutPETCalculate/getSplenicVerify?visitTaskId=${visitTaskId}`,
+    method: 'post'
+  })
+}
 export function uploadTrialSiteSurveyUser(trialId, baseUrl, routeUrl, param) {
  return request({
    url: `/TrialSiteSurvey/UploadTrialSiteSurveyUser?trialId=${trialId}&baseUrl=${baseUrl}&routeUrl=${routeUrl}`,
@ -4282,3 +4318,116 @@ export function deleteAuditRecord(auditRecordId) {
    method: 'delete'
  })
 }
+// 核对中心人员发送邮件
+export function sendCheckSiteSurveyUserEmail(data) {
+  return request({
+    url: `/TrialSiteSurvey/sendCheckSiteSurveyUserEmail`,
+    method: 'post',
+    data
+  })
+}
+// 更新中心人员发送邮件
+export function sendUpdateSiteSurveyUserEmail(data) {
+  return request({
+    url: `/TrialSiteSurvey/sendUpdateSiteSurveyUserEmail`,
+    method: 'post',
+    data
+  })
+}
+// 更新中心人员发送邮件
+export function getTrialSiteLatestSurvey(params) {
+  return request({
+    url: `/TrialSiteSurvey/getTrialSiteLatestSurvey`,
+    method: 'get',
+    params
+  })
+}
+// 阅片期计划列表
+export function getReadModulePageList(data) {
+  return request({
+    url: `/ReadModule/getReadModulePageList`,
+    method: 'post',
+    data
+  })
+}
+// 移除阅片期
+export function setBatchRemoveReadingPlan(data) {
+  return request({
+    url: `/ReadingPeriodSet/setBatchRemoveReadingPlan`,
+    method: 'post',
+    data
+  })
+}
+// 更新项目额外json配置
+export function updateTrialExtralConfig(params, data) {
+  return request({
+    url: `/TrialConfig/updateTrialExtralConfig`,
+    method: 'put',
+    params,
+    data
+  })
+}
+// 获取项目标准阅片关键点列表
+export function getTrialCriterionKeyFileList(data) {
+  return request({
+    url: `/TrialCriterionKeyFile/getTrialCriterionKeyFileList`,
+    method: 'post',
+    data
+  })
+}
+// 设置已阅读关键文件
+export function setReadKeyFile(data) {
+  return request({
+    url: `/ReadingImageTask/setReadKeyFile`,
+    method: 'post',
+    data
+  })
+}
+// 项目报表-访视完成度
+export function getTrialVisitFinishedStatList(data) {
+  return request({
+    url: `/TrialStat/getTrialVisitFinishedStatList`,
+    method: 'post',
+    data
+  })
+}
+// 项目报表-质疑统计表
+export function getTrialQuestionStatList(data) {
+  return request({
+    url: `/TrialStat/getTrialQuestionStatList`,
+    method: 'post',
+    data
+  })
+}
+// 项目报表-疗效统计表
+export function getTrialEfficacyEvaluationStatList(data) {
+  return request({
+    url: `/TrialStat/getTrialEfficacyEvaluationStatList`,
+    method: 'post',
+    data
+  })
+}
+// 受试者图表
+export function getReportsChartSummary(data) {
+  return request({
+    url: `/ReadingImageTask/getReportsChartSummary`,
+    method: 'post',
+    data
+  })
+}
+// 靶段标注列表
+export function getTrialSubjectVisitMarkList(data) {
+  return request({
+    url: `/DownloadAndUpload/getTrialSubjectVisitMarkList`,
+    method: 'post',
+    data
+  })
+}
+// 更新缩略图
+export function updateImageResizePath(data) {
+  return request({
+    url: `/Series/updateImageResizePath`,
+    method: 'post',
+    data
+  })
+}
--- a/src/assets/mp4.png
+++ b/src/assets/mp4.png
--- a/src/assets/system.png
+++ b/src/assets/system.png
--- a/src/components/AGR/fun.js
+++ b/src/components/AGR/fun.js
@ -0,0 +1,37 @@
+import Vue from "vue";
+import AGRCOMP from "./index.vue";
+
+const MFAConstructor = Vue.extend(AGRCOMP);
+let MFAINSTANCELIST = [];
+const AGR = options => {
+    const { Id, IsEn_Us, callBack, cancelBack } = options;
+    if (!Id) throw `Id is requred.but ${Id}`
+    const id = `AGR${new Date().getTime()}`;
+    const instance = new MFAConstructor();
+    MFAINSTANCELIST.push(instance)
+    instance.id = id;
+    instance.vm = instance.$mount();
+    if (instance.vm.visible) return;
+    document.body.appendChild(instance.vm.$el);
+    instance.vm.open({ Id, IsEn_Us });
+    instance.vm.$on("success", (Id) => {
+        if (callBack) callBack(Id)
+    });
+    instance.vm.$on("closed", () => {
+        if (cancelBack) cancelBack();
+        document.body.removeChild(instance.vm.$el);
+        instance.vm.$destroy();
+        let index = MFAINSTANCELIST.findIndex(item => item.id === id);
+        MFAINSTANCELIST.splice(index, 1)
+    });
+    return instance.vm;
+}
+AGR.close = () => {
+    if (MFAINSTANCELIST.length <= 0) return;
+    MFAINSTANCELIST.forEach(item => {
+        document.body.removeChild(item.vm.$el);
+        item.vm.$destroy();
+    })
+    MFAINSTANCELIST = [];
+}
+export default AGR;
--- a/src/components/AGR/index.js
+++ b/src/components/AGR/index.js
@ -0,0 +1,7 @@
+import AGRCOMP from "./index.vue";
+import AGR from "./fun";
+
+export default Vue => {
+    Vue.component(AGRCOMP.name, AGRCOMP);
+    Vue.prototype.$AGR = AGR;
+};
--- a/src/components/AGR/index.vue
+++ b/src/components/AGR/index.vue
@ -0,0 +1,65 @@
+<template>
+  <!--AGR-->
+  <el-dialog v-if="visible" :visible.sync="visible" width="60%" :close-on-click-modal="false" append-to-body center
+    :show-close="true" @close="cancel">
+    <!-- <div slot="title">
+      {{ agreement.FileName }} 
+    </div> -->
+    <div v-html="agreement.FileEnContent" class="content" v-if="IsEn_Us"></div>
+    <div v-html="agreement.FileContent" class="content" v-else></div>
+  </el-dialog>
+</template>
+<script>
+import {
+  getUserAgreementById
+} from '@/api/dictionary'
+export default {
+  name: "AGR",
+  data() {
+    return {
+      visible: false,
+      agreement: {},
+      IsEn_Us: false
+    }
+  },
+  mounted() {
+
+  },
+  methods: {
+    async getAgreement(Id) {
+      try {
+        let data = {
+          Id
+        }
+        let res = await getUserAgreementById(data)
+        if (res.IsSuccess) {
+          this.agreement = res.Result
+        }
+      } catch (err) {
+        console.log(err)
+      }
+    },
+    open(data) {
+      let { Id, IsEn_Us } = data;
+      this.IsEn_Us = IsEn_Us
+      this.getAgreement(Id)
+      this.visible = true
+    },
+    cancel() {
+      this.visible = false;
+      this.$emit("closed");
+    },
+
+  },
+};
+</script>
+<style lang="scss" scoped>
+::v-deep .el-dialog__body {
+  height: 500px;
+}
+
+.content {
+  height: 100%;
+  overflow-y: auto;
+}
+</style>
--- a/src/components/Breadcrumb/index.vue
+++ b/src/components/Breadcrumb/index.vue
@ -2,9 +2,17 @@
  <el-breadcrumb class="app-breadcrumb" separator-class="el-icon-arrow-right">
    <transition-group name="breadcrumb">
      <el-breadcrumb-item v-for="(item,index) in levelList" :key="item.path">
-        <span v-if="item.redirect==='noRedirect'||index==levelList.length-1" class="no-redirect">{{ item.meta.title }}</span>
-        <span v-else-if="item.name === 'TrialsPanel'" class="no-redirect">{{ item.meta.title }}</span>
-        <a v-else @click.prevent="handleLink(item)">{{ item.meta.title }}</a>
+        <span v-if="item.redirect==='noRedirect'||index==levelList.length-1" class="no-redirect">
+          <!-- {{ item.meta.title }} -->
+            {{ item.meta.i18n ? $t(item.meta.i18n) : item.meta.title }}
+        </span>
+        <span v-else-if="item.name === 'TrialsPanel'" class="no-redirect">
+          <!-- {{ item.meta.title }} -->
+          {{ item.meta.i18n ? $t(item.meta.i18n) : item.meta.title }}
+        </span>
+        <a v-else @click.prevent="handleLink(item)">
+          {{ item.meta.i18n ? $t(item.meta.i18n) : item.meta.title }}
+        </a>
      </el-breadcrumb-item>
    </transition-group>
  </el-breadcrumb>
@ -35,6 +43,7 @@ export default {
          item.meta.title = this.$route.query.trialCode // 暂时处理
        }
      })
+      
      this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false)
    },
    isDashboard(route) {
--- a/src/components/MFA/index.vue
+++ b/src/components/MFA/index.vue
@ -1,25 +1,11 @@
 <template>
  <!--MFA-->
-  <el-dialog
-    v-if="visible"
-    :visible.sync="visible"
-    width="540px"
-    :close-on-click-modal="false"
-    append-to-body
-    center
-    :show-close="status === 'login'"
-    @close="cancel"
-  >
+  <el-dialog v-if="visible" :visible.sync="visible" width="540px" :close-on-click-modal="false" append-to-body center
+    :show-close="status === 'login'" @close="cancel">
    <div slot="title">
      {{ status === "login" ? $t("mfa:title") : $t("mfa:lock:title") }}
    </div>
-    <el-form
-      ref="mfaForm"
-      label-position="right"
-      :model="form"
-      :rules="rules"
-      label-width="100px"
-    >
+    <el-form ref="mfaForm" label-position="right" :model="form" :rules="rules" label-width="100px">
      <!-- 邮箱 -->
      <p class="tip_mfa">
        <i class="el-icon-warning" style="color: #409eff"></i>
@ -31,18 +17,13 @@
      </el-form-item>
      <!-- 验证码 -->
      <el-form-item :label="$t('mfa:form:MFACode')" prop="Code">
-        <el-input
-          :placeholder="$t('mfa:form:input:placeholder:Codes')"
-          v-model="form.Code"
-          style="width: 240px; margin-right: 10px"
-        />
-        <el-button
-          type="primary"
-          size="small"
-          @click.stop="sendMFACode"
-          :disabled="flag || sendFlag"
-          >{{ flag ? `${second}s` : $t("mfa:form:sendMFACode") }}</el-button
-        >
+        <div style="display: flex;justify-content: space-between;width: 90%;">
+          <el-input :placeholder="$t('mfa:form:input:placeholder:Codes')" v-model="form.Code" />
+          <el-button size="small" @click.stop="sendMFACode" :disabled="flag || sendFlag" style="margin-left: 10px;"
+            class="codeBtn">{{
+              flag ?
+                `${$t("mfa:form:sendMFACodeCountDown")} (${second}s)` : $t("mfa:form:sendMFACode") }}</el-button>
+        </div>
      </el-form-item>
    </el-form>
    <div slot="footer">
@ -51,19 +32,16 @@
        {{ $t("mfa:button:cancel") }}
      </el-button> -->
      <!-- 保存 -->
-      <el-button
-        type="primary"
-        size="small"
-        @click="save"
-        :loading="loading"
-        style="width: 80%"
-      >
+      <el-button type="primary" size="small" @click="save" :loading="loading" style="width: 80%">
        {{
          status === "login"
            ? $t("mfa:button:save")
            : $t("mfa:lock:button:save")
        }}
      </el-button>
+      <p style="text-align: left;font-size: 14px;margin:10px auto;width: 80%;">
+        <el-checkbox v-model="form.isRemember" /><span style="margin-left: 10px;">{{ $t("mfa:tip:noLogin") }}</span>
+      </p>
    </div>
  </el-dialog>
 </template>
@ -86,6 +64,7 @@ export default {
        IdentityUserId: null,
        EMail: null,
        username: null,
+        isRemember: true
      },
      rules: {
        Code: [
@ -112,6 +91,18 @@ export default {
      },
    };
  },
+  mounted() {
+    this.flag = true;
+    this.second = 60;
+    this.timer = setInterval(() => {
+      this.second--;
+      if (this.second <= 0) {
+        this.flag = false;
+        clearInterval(this.timer);
+        this.timer = null;
+      }
+    }, 1000);
+  },
  methods: {
    open(data) {
      let { UserId, status, username, EMail } = data;
@ -189,6 +180,21 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.codeBtn {
+  color: #409EFF;
+  border-color: #409EFF;
+}
+
+.codeBtn.is-disabled,
+.codeBtn.is-disabled:focus,
+.codeBtn.is-disabled:hover {
+  color: #c0c4cc;
+  cursor: not-allowed;
+  background-image: none;
+  background-color: #fff;
+  border-color: #ebeef5;
+}
+
 .tip_mfa {
  width: 86%;
  margin: auto;
@ -198,10 +204,12 @@ export default {
  line-height: 30px;
  border-radius: 5px;
  background-color: #eee;
+
  i {
    margin-right: 5px;
  }
 }
+
 ::v-deep .el-dialog__header {
  font-weight: bold;
 }
--- a/src/components/Preview/fun.js
+++ b/src/components/Preview/fun.js
@ -4,7 +4,7 @@ import Preview from "./index.vue";
 const PreviewConstructor = Vue.extend(Preview);

 const preview = options => {
-    const { path, type, title } = options;
+    const { path, type, title, isLocal = false } = options;
    if (!path) throw `path is requred.but ${path}`
    const id = `Preview_${new Date().getTime()}`;
    const instance = new PreviewConstructor();
@ -12,7 +12,7 @@ const preview = options => {
    instance.vm = instance.$mount();
    if (instance.vm.visible) return;
    document.body.appendChild(instance.vm.$el);
-    instance.vm.open(path, type, title);
+    instance.vm.open(path, type, title, isLocal);
    instance.vm.$on("closed", () => {
        document.body.removeChild(instance.vm.$el);
        instance.vm.$destroy();
--- a/src/components/Preview/index.vue
+++ b/src/components/Preview/index.vue
@ -1,15 +1,8 @@
 <template>
-  <el-dialog
-    v-if="visible"
-    :visible.sync="visible"
-    :title="title"
-    :fullscreen="true"
-    append-to-body
-    custom-class="base-dialog-wrapper"
-    @close="handleClose"
-  >
+  <el-dialog v-if="visible" :visible.sync="visible" :title="title" :fullscreen="true" append-to-body
+    custom-class="base-dialog-wrapper" @close="handleClose">
    <div class="base-modal-body" style="border: 2px solid #ccc; padding: 10px">
-      <PreviewFile v-if="visible" :file-path="path" :file-type="type" />
+      <PreviewFile v-if="visible" :file-path="path" :file-type="type" :is-local="isLocal" />
    </div>
  </el-dialog>
 </template>
@ -24,13 +17,15 @@ export default {
      path: null,
      type: null,
      title: null,
+      isLocal: false
    };
  },
  methods: {
-    open(path, type, title) {
+    open(path, type, title, isLocal) {
      this.path = path;
      this.type = type;
      this.title = title;
+      this.isLocal = isLocal;
      this.visible = true;
    },
    handleClose() {
--- a/src/components/PreviewFile/index.vue
+++ b/src/components/PreviewFile/index.vue
@ -5,16 +5,17 @@
    <!-- <embed v-else-if="fileType.indexOf('pdf') !== -1" :src="filePath+'#toolbar=0'" style="width: 100%; height: 100%"> -->
    <!-- <iframe v-else-if="fileType.indexOf('pdf') !== -1" :src="filePath+'#toolbar=0'" width="100%" height="100%" frameborder="0" /> -->
    <iframe v-else-if="fileType.indexOf('pdf') !== -1"
-      :src="`/static/pdfjs/web/viewer.html?file=${OSSclientConfig.basePath}${filePath}?userName=${currentUser}&COMPANY=${COMPANY}`"
+      :src="`/static/pdfjs/web/viewer.html?file=${isLocal ? window.location.origin : OSSclientConfig.basePath}${filePath}?userName=${currentUser}&COMPANY=${COMPANY}`"
      width="100%" height="100%" frameborder="0" crossorigin="anonymous" />
    <!--    <pdf-->
    <!--      v-else-if="fileType.indexOf('pdf') !== -1"-->
    <!--      :src="`/static/pdfjs/web/viewer.html?file=${filePath}`">-->
    <!--    </pdf>-->
-    <video :src="`${OSSclientConfig.basePath}${filePath}`" style="width: 100%;height: 99%;" autoplay controls
-      controlsList="nodownload" v-else-if="fileType.indexOf('mp4') !== -1"></video>
+    <video :src="`${isLocal ? window.location.origin : OSSclientConfig.basePath}${filePath}`"
+      style="width: 100%;height: 99%;" autoplay controls controlsList="nodownload"
+      v-else-if="fileType.indexOf('mp4') !== -1"></video>
    <iframe v-else
-      :src="`/static/onlyOffice/viewer.html?url=${OSSclientConfig.basePath}${filePath}?onlyOffice_url=${onlyOffice_url}&type=${fileType}&title=${title}&documentType=${documentType}&userName=${currentUser}`"
+      :src="`/static/onlyOffice/viewer.html?url=${isLocal ? window.location.origin : OSSclientConfig.basePath}${filePath}?onlyOffice_url=${onlyOffice_url}&type=${fileType}&title=${title}&documentType=${documentType}&userName=${currentUser}`"
      width="100%" height="100%" frameborder="0" crossorigin="anonymous" />
    <!-- <div v-else>
      {{ $t('common:message:downloadFile') }}
@ -43,12 +44,17 @@ export default {
      type: String,
      default: ''
    },
+    isLocal: {
+      type: Boolean,
+      default: false
+    }
  },
  data() {
    return {
      currentUser: zzSessionStorage.getItem('userName'),
      COMPANY: process.env.VUE_APP_COMPANY_NAME,
-      onlyOffice_url: process.env.VUE_APP_ONLYOFFICE_URL
+      onlyOffice_url: process.env.VUE_APP_ONLYOFFICE_URL,
+      window,
    }
  },
  computed: {
--- a/src/components/Screenfull/index.vue
+++ b/src/components/Screenfull/index.vue
@ -22,7 +22,7 @@ export default {
  },
  methods: {
    click() {
-      if (!screenfull.enabled) {
+      if (!screenfull.isEnabled) {
        this.$message({
          message: 'you browser can not work',
          type: 'warning'
@ -35,12 +35,12 @@ export default {
      this.isFullscreen = screenfull.isFullscreen
    },
    init() {
-      if (screenfull.enabled) {
+      if (screenfull.isEnabled) {
        screenfull.on('change', this.change)
      }
    },
    destroy() {
-      if (screenfull.enabled) {
+      if (screenfull.isEnabled) {
        screenfull.off('change', this.change)
      }
    }
--- a/src/components/TrialsTab/index.vue
+++ b/src/components/TrialsTab/index.vue
@ -2,19 +2,21 @@
 <template>
  <div class="trialsTab">
    <el-tabs v-model="trialsTab" @tab-click="clickTab">
-      <el-tab-pane v-for="item of trialsRouter.children.find(v => {return v.name == 'TrialsPanel'}).children" :key="`tab${item.path}`" :disabled="TotalNeedSignTrialDocCount !== 0 && item.path !== '/trials/trials-panel/attachments'" :label="$t(item.LanguageMark)" :name="item.path">
-        <el-tabs v-if="!item.tabHiddn" v-model="trialsTabChild" @tab-click="clickTab" style="background-color: #f5f7fa;">
+      <template v-for="item of trialsRouter.children.find(v => { return v.name == 'TrialsPanel' }).children">
+        <el-tab-pane :key="`tab${item.path}`"
+          :disabled="TotalNeedSignTrialDocCount !== 0 && item.path !== '/trials/trials-panel/attachments'"
+          :label="$t(item.LanguageMark)" :name="item.path" v-if="isShowNode(item)">
+          <el-tabs v-if="!item.tabHiddn" v-model="trialsTabChild" @tab-click="clickTab"
+            style="background-color: #f5f7fa;">
            <template v-for="item1 of item.children">
-            <el-tab-pane
-              v-if="TrialConfig && isShow(item1.path)"
-              :key="`tab1${item1.path}`"
+              <el-tab-pane v-if="TrialConfig && isShow(item1.path)" :key="`tab1${item1.path}`"
                :disabled="TotalNeedSignTrialDocCount !== 0 && item1.path !== '/trials/trials-panel/attachments/self-attachment' || (TrialStatusStr === 'Initializing' && (item1.path === '/trials/trials-panel/setting/personnel-manage' || item1.path === '/trials/trials-panel/setting/qc-question' || item1.path === '/trials/trials-panel/setting/reading-unit' || item1.path === '/trials/trials-panel/setting/medical-audit' || item1.path === '/trials/trials-panel/setting/email-manage'))"
-              :label="$t(item1.LanguageMark)"
-              :name="item1.path"
-            />
+                :label="$t(item1.LanguageMark)" :name="item1.path" />
            </template>
          </el-tabs>
        </el-tab-pane>
+      </template>
+
    </el-tabs>
    <div style="position: absolute;top: 0;right: 0;display: flex;justify-content: space-between;align-items: center">
      <trials-select />
@ -117,8 +119,17 @@ export default {
    }
  },
  methods: {
-    isShow: function(path) {
+    isShowNode(item) {
+      if (item.path === '/trials/trials-panel/trial-summary' && item.children.length === 1 && item.children[0].path === '/trials/trials-panel/trial-summary/report-forms' && !this.$store.state.trials.config.IsExternalViewTrialChart && this.hasPermi(['role:cmm', 'role:cpm', 'role:ea', 'role:mc', 'role:smm', 'role:spm'])) {
+        return false
+      }
+      return true
+    },
+    isShow: function (path) {
      var isShow = true
+      let chartList = [
+        '/trials/trials-panel/trial-summary/report-forms'
+      ]
      var qualityList = [
        '/trials/trials-panel/visit/crc-question',
        '/trials/trials-panel/visit/qc-check',
@ -134,6 +145,9 @@ export default {
        '/trials/trials-panel/trial-summary/image-inspect',
        '/trials/trials-panel/trial-summary/push-record',
      ]
+      if (!this.$store.state.trials.config.IsExternalViewTrialChart && ~chartList.indexOf(path) && this.hasPermi(['role:cmm', 'role:cpm', 'role:ea', 'role:mc', 'role:smm', 'role:spm'])) {
+        isShow = false
+      }
      if (this.TrialConfig.QCProcessEnum === 0 && ~qualityList.indexOf(path)) {
        isShow = false
      }
@ -205,56 +219,69 @@ export default {
 }
 </script>
 <style lang="scss">
-  .trialsTab{
-    .my_icon_box{
-      padding:0 20px 0 0;
-      transition: color,transform .3s;
+.trialsTab {
+  .my_icon_box {
+    padding: 0 20px 0 0;
+    transition: color, transform .3s;
    cursor: pointer;
    color: #666;
    display: flex;
    justify-content: center;
    align-items: center;
-      &:hover{
+
+    &:hover {
      color: #428bca;
    }
-      span{
+
+    span {
      margin-left: 3px;
      font-size: 14px;
    }
  }
-    .el-tabs__header{
+
+  .el-tabs__header {
    margin-bottom: 3px;
  }
-    .el-tabs__item.is-active{
+
+  .el-tabs__item.is-active {
    font-weight: bold;
  }
+
  position: relative;
-    .el-input--medium .el-input__inner{
-      height: 44px;line-height: 44px;width: 280px;
+
+  .el-input--medium .el-input__inner {
+    height: 44px;
+    line-height: 44px;
+    width: 280px;
    border: none;
    text-align: right;
  }
-  }
-  .base-model-wrapper{
-    .el-dialog__header{
+}
+
+.base-model-wrapper {
+  .el-dialog__header {
    padding: 10px;
-      .el-dialog__headerbtn{
+
+    .el-dialog__headerbtn {
      top: 10px;
      right: 10px;
    }
  }
-    .el-dialog__body{
-      padding:10px 10px 10px 10px;
-      .base-modal-body{
+
+  .el-dialog__body {
+    padding: 10px 10px 10px 10px;
+
+    .base-modal-body {
      min-height: 100px;
-        max-height:650px;
+      max-height: 650px;
      overflow-y: auto;
      padding: 10px;
      border: 1px solid #e0e0e0;
    }
  }
-    .el-dialog__footer{
+
+  .el-dialog__footer {
    padding: 10px;
  }
-  }
+}
 </style>
--- a/src/components/downloadDicomAndNonedicom/index.vue
+++ b/src/components/downloadDicomAndNonedicom/index.vue
@ -34,9 +34,11 @@
      <!--受试者-->
      <el-table-column :label="$t('download:table:subjectCode')" min-width="130" prop="SubjectCode"
        show-overflow-tooltip />
+      <!--访视名称-->
+      <el-table-column prop="VisitName" :label="$t('download:table:VisitName')" sortable v-if="IsImageSegment" />
      <!--任务名称-->
      <el-table-column :label="$t('download:table:taskName')" min-width="130" show-overflow-tooltip prop="TaskBlindName"
-        sortable />
+        sortable v-else />
      <!--检查类型-->
      <el-table-column :label="$t('download:table:studyType')" min-width="130" show-overflow-tooltip prop="IsDicom"
        sortable>
@ -66,7 +68,7 @@
      <el-table-column :label="$t('common:action:action')" fixed="right" width="150">
        <template slot-scope="scope">
          <!--预览--->
-          <el-button circle icon="el-icon-view" :title="$t('download:button:preview')"
+          <el-button circle icon="el-icon-view" :title="$t('download:button:preview')" :disabled="forbid"
            @click.stop="preview(scope.row)" />
          <!--下载--->
          <el-button circle icon="el-icon-download" :title="$t('download:button:download')"
@ -75,7 +77,8 @@
      </el-table-column>
    </el-table>
    <study-view v-if="model_cfg.visible" :model_cfg="model_cfg" :modelList="modelList" :bodyPart="bodyPart"
-      :IsDicom="IsDicom" :visitTaskId="modelTaskId" />
+      :subjectVisitId="modelSubjectVisitId" :IsDicom="IsDicom" :isDownload="true" :visitTaskId="modelTaskId"
+      :IsImageSegment="IsImageSegment" :Criterion="Criterion" />
  </el-dialog>
 </template>
 <script>
@ -108,6 +111,10 @@ export default {
      type: Boolean,
      default: false,
    },
+    forbid: {
+      type: Boolean,
+      default: false,
+    },
    SubjectId: {
      type: String,
      default: '',
@ -126,6 +133,10 @@ export default {
        return {}
      },
    },
+    IsImageSegment: {
+      type: Boolean,
+      default: false,
+    }
  },
  data() {
    return {
@ -151,12 +162,14 @@ export default {
      IsReadingTaskViewInOrder: 0, // 阅片规则
      bodyPart: {},
      modelTaskId: null,
+      modelSubjectVisitId: null,
    }
  },
  async mounted() {
    this.bodyPart.Bodypart = await this.$getBodyPart(this.$route.query.trialId)
    this.getList()
    this.title = `Download Images：${this.SubjectCode}（${this.Criterion.TrialReadingCriterionName}）`
+    if (this.IsImageSegment) this.title = `Download Images：${this.SubjectCode}`
  },
  beforeDestroy() {
    store.dispatch('trials/setUnLock', false)
@ -175,6 +188,12 @@ export default {
        if (this.TaskId) {
          this.searchData.VisitTaskId = this.TaskId
        }
+        if (this.IsImageSegment) {
+          this.searchData.IsImageSegmentLabel = true
+        }
+        else if (this.Criterion.CriterionType == 19 || this.Criterion.CriterionType == 20) {
+          this.searchData.IsImageSegmentLabel = false
+        }
        this.loading = true
        let res = await getSubjectImageDownloadSelectList(this.searchData)
        this.loading = false
@ -257,6 +276,12 @@ export default {
            data.NoneDicomStudyIdList = [...data.NoneDicomStudyIdList, ...arr]
          }
        }
+        if (this.IsImageSegment) {
+          data.IsImageSegmentLabel = true
+        }
+        else if (this.Criterion.CriterionType == 19 || this.Criterion.CriterionType == 20) {
+          data.IsImageSegmentLabel = false
+        }
        this.btnLoading = true
        let res = await getIRReadingDownloadStudyInfo(data)
        this.btnLoading = false
@ -286,6 +311,9 @@ export default {
    formatDownloadFile(list) {
      let files = [],
        name = `${list[0].SubjectCode}_${new Date().getTime()}.zip`
+      if (this.IsImageSegment) {
+        name = `${list[0].SubjectCode}.zip`
+      } else {
        if (this.IsReadingTaskViewInOrder === 1) {
          name = `${list[0].SubjectCode}_${list[0].TaskBlindName}.zip`
        }
@ -293,6 +321,8 @@ export default {
          // name = `${list[0].TaskBlindName}.zip`
          name = `${list[0].SubjectCode}_${list[0].TaskBlindName}.zip`
        }
+      }
+
      list.forEach((data) => {
        if (data.StudyList && data.StudyList.length > 0) {
          let StudyList = data.StudyList
@ -304,7 +334,14 @@ export default {
                  }/DICOMDIR`,
                url: this.OSSclientConfig.basePath + study.StudyDIRPath,
              }
-              if (this.IsReadingTaskViewInOrder === 0) {
+              if (this.IsImageSegment) {
+                obj = {
+                  name: `${data.SubjectCode}/${data.VisitName
+                    }/${this.$fd('IsDicom', true)}/${study.StudyCode
+                    }/DICOMDIR`,
+                  url: this.OSSclientConfig.basePath + study.StudyDIRPath,
+                }
+              } else if (this.IsReadingTaskViewInOrder === 0) {
                obj = {
                  name: `${data.TaskBlindName}/${this.$fd(
                    'IsDicom',
@ -330,7 +367,15 @@ export default {
                      url: this.OSSclientConfig.basePath + instance.Path,
                      IsEncapsulated: instance.IsEncapsulated
                    }
-                    if (this.IsReadingTaskViewInOrder === 0) {
+                    if (this.IsImageSegment) {
+                      obj = {
+                        name: `${data.SubjectCode}/${data.VisitName
+                          }/${this.$fd('IsDicom', true)}/${study.StudyCode
+                          }/IMAGE/${fileName}`,
+                        url: this.OSSclientConfig.basePath + instance.Path,
+                        IsEncapsulated: instance.IsEncapsulated
+                      }
+                    } else if (this.IsReadingTaskViewInOrder === 0) {
                      obj = {
                        name: `${data.TaskBlindName}/${this.$fd(
                          'IsDicom',
@ -360,7 +405,16 @@ export default {
                  )}/${study.StudyCode}/${item.FileName}`,
                  url: this.OSSclientConfig.basePath + item.Path,
                }
-                if (this.IsReadingTaskViewInOrder === 0) {
+                if (this.IsImageSegment) {
+                  obj = {
+                    name: `${data.SubjectCode}/${data.VisitName}/${this.$fd(
+                      'IsDicom',
+                      false
+                    )}/${study.StudyCode}/${item.FileName}`,
+                    url: this.OSSclientConfig.basePath + item.Path,
+                  }
+                }
+                else if (this.IsReadingTaskViewInOrder === 0) {
                  obj = {
                    name: `${data.TaskBlindName}/${this.$fd(
                      'IsDicom',
@ -390,6 +444,9 @@ export default {
    },
    handleOpenDialog(item) {
      this.model_cfg.title = `${item.SubjectCode || ''} > ${item.TaskBlindName}`
+      if (this.IsImageSegment) {
+        this.model_cfg.title = `${item.SubjectCode || ''} > ${item.VisitName}`
+      }
      if (item.IsDicom) {
        this.modelList = item.DicomStudyList
      } else {
@ -399,6 +456,7 @@ export default {
        })
      }
      this.modelTaskId = item.VisitTaskId
+      this.modelSubjectVisitId = item.SourceSubjectVisitId
      this.IsDicom = item.IsDicom
      this.model_cfg.visible = true
    },
@ -427,9 +485,16 @@ export default {
      }
      let trialId = this.$route.query.trialId
      var token = getToken()
-      const routeData = this.$router.resolve({
-        path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${row.SourceSubjectVisitId}&TokenKey=${token}&isReading=true`,
+      let routeData = null
+      if (!this.IsImageSegment && (this.Criterion.CriterionType == 19 || this.Criterion.CriterionType == 20)) {
+        routeData = this.$router.resolve({
+          path: `/showNoneDicoms?trialId=${trialId}&isImageSegmentLabel=${false}&visitTaskId=${row.VisitTaskId}&subjectVisitId=${row.SourceSubjectVisitId}&TokenKey=${token}&isReading=true`,
        })
+      } else {
+        routeData = this.$router.resolve({
+          path: `/showNoneDicoms?trialId=${trialId}&visitTaskId=${row.VisitTaskId}&subjectVisitId=${row.SourceSubjectVisitId}&TokenKey=${token}&isReading=true`,
+        })
+      }
      this.open = window.open(routeData.href, '_blank')
    },
    // 预览阅片影像
--- a/src/components/readingChart/index.vue
+++ b/src/components/readingChart/index.vue
@ -0,0 +1,239 @@
+<template>
+    <div :id="key" class="readingChart" v-show="visible" :style="{
+        'z-index': zIndex
+    }">
+        <div ref="chartContainer" style="width: 490px; height: 290px;" v-loading="loading"></div>
+    </div>
+</template>
+
+<script>
+import { getReportsChartData } from "@/api/reading"
+let echarts = require('echarts/lib/echarts');
+
+// 按需引入图表
+// require('echarts/lib/chart/bar');
+require('echarts/lib/chart/line');
+// require('echarts/lib/chart/pie');
+// require('echarts/lib/chart/scatter');
+
+// 按需引入组件
+require('echarts/lib/component/tooltip');
+require('echarts/lib/component/title');
+require('echarts/lib/component/legend');
+require('echarts/lib/component/grid');
+require('echarts/lib/component/dataZoom');
+export default {
+    name: "readingChart",
+    props: {
+
+    },
+    data() {
+        return {
+            visible: false,
+            zIndex: 9,
+            chart: null,
+            loading: false,
+            key: 'readingChart'
+        };
+    },
+    methods: {
+        init(event, obj, zIndex = 9) {
+            this.loading = true
+            this.zIndex = zIndex
+            let { key } = obj
+            if (key) {
+                this.key = key
+            }
+            this.$nextTick(() => {
+                this.visible = true
+                let readingChart = document.querySelector(`#${this.key}`);
+                let chaY = document.body.clientHeight - event.clientY;
+                let chaX = document.body.clientWidth - event.clientX;
+                if (chaY < 250) {
+                    readingChart.style.top = event.clientY - 220 + "px";
+                } else {
+                    readingChart.style.top = event.clientY + "px";
+                }
+                if (chaX < 500) {
+                    readingChart.style.left = event.clientX - 520 + "px";
+                } else {
+                    readingChart.style.left = event.clientX + 15 + "px";
+                }
+                this.getInfo(obj)
+            })
+        },
+        async getInfo(data) {
+            try {
+                let { VisitTaskId = null, TrialId = null, QuestionId = null, QuestionName = null, TableQuestionId = null, RowIndex = null, ReportChartTypeEnum = null } = data
+                let params = {
+                    VisitTaskId, TrialId, QuestionId, TableQuestionId, RowIndex, ReportChartTypeEnum
+                }
+                this.loading = true
+                let res = await getReportsChartData(params)
+                this.loading = false
+                if (res.IsSuccess) {
+                    let LatestScanDateList = res.Result.LatestScanDateList.map(item => item.split(" ")[0])
+                    let obj = {
+                        title: QuestionName,
+                        xAxisData: LatestScanDateList || [],
+                        series: [],
+                        unit: this.$fd("ValueUnit", res.Result.Unit),
+                        visitName: res.Result.VisitTaskNameList,
+                        min: null,
+                        max: null
+                    }
+                    res.Result.ChartDataList.forEach((item) => {
+                        let arr = []
+                        item.Value.forEach((d, index) => {
+                            // arr.push([LatestScanDateList[index], d])
+                            arr.push(d)
+                        })
+                        obj.series.push({
+                            name: item.Name,
+                            data: arr,
+                            type: 'line'
+                        })
+                    });
+                    // if (Array.isArray(res.Result.LatestScanDateList) && res.Result.LatestScanDateList.length >= 2) {
+                    //     let hours = moment(res.Result.LatestScanDateList[res.Result.LatestScanDateList.length - 1]).diff(moment(res.Result.LatestScanDateList[0]), 'hours');
+                    //     let days = moment(res.Result.LatestScanDateList[res.Result.LatestScanDateList.length - 1]).diff(moment(res.Result.LatestScanDateList[0]), 'days');
+                    //     let months = moment(res.Result.LatestScanDateList[res.Result.LatestScanDateList.length - 1]).diff(moment(res.Result.LatestScanDateList[0]), 'months');
+                    //     console.log(hours, 'hours')
+                    //     console.log(days, 'days')
+                    //     console.log(months, 'months')
+                    //     if (hours < 24) {
+                    //         obj.min = moment(res.Result.LatestScanDateList[0]).format('YYYY-MM-DD') + ' 00:00:00'
+                    //         obj.max = moment(res.Result.LatestScanDateList[0]).format('YYYY-MM-DD') + ' 23:59:59'
+                    //     }
+                    //     if (days >= 1 && days <= 7) {
+                    //         obj.min = moment(res.Result.LatestScanDateList[0]).format('YYYY-MM-DD') + ' 00:00:00'
+                    //         obj.max = moment(res.Result.LatestScanDateList[0]).add(7, 'days').format('YYYY-MM-DD') + ' 23:59:59'
+                    //     }
+                    //     if (days > 7 && days < 30) {
+                    //         obj.min = moment(res.Result.LatestScanDateList[0]).startOf('month').format('YYYY-MM-DD') + ' 00:00:00'
+                    //         obj.max = moment(res.Result.LatestScanDateList[0]).endOf('month').format('YYYY-MM-DD') + ' 23:59:59'
+                    //     }
+                    //     if (months >= 1 && months <= 3) {
+                    //         obj.min = moment(res.Result.LatestScanDateList[0]).startOf('month').format('YYYY-MM-DD') + ' 00:00:00'
+                    //         obj.max = moment(res.Result.LatestScanDateList[0]).add(4, 'months').startOf('month').format('YYYY-MM-DD') + ' 23:59:59'
+                    //     }
+                    //     if (months > 3 && months <= 6) {
+                    //         obj.min = moment(res.Result.LatestScanDateList[0]).startOf('month').format('YYYY-MM-DD') + ' 00:00:00'
+                    //         obj.max = moment(res.Result.LatestScanDateList[0]).add(7, 'months').startOf('month').format('YYYY-MM-DD') + ' 23:59:59'
+                    //     }
+                    //     if (months > 6 && months <= 12) {
+                    //         obj.min = moment(res.Result.LatestScanDateList[0]).startOf('month').format('YYYY-MM-DD') + ' 00:00:00'
+                    //         obj.max = moment(res.Result.LatestScanDateList[0]).add(13, 'months').startOf('month').format('YYYY-MM-DD') + ' 23:59:59'
+                    //     }
+                    //     if (months > 12) {
+                    //         obj.min = moment(res.Result.LatestScanDateList[0]).startOf('month').format('YYYY-MM-DD') + ' 00:00:00'
+                    //         obj.max = moment(res.Result.LatestScanDateList[res.Result.LatestScanDateList.length - 1]).add(1, 'months').startOf('month').format('YYYY-MM-DD') + ' 23:59:59'
+                    //     }
+                    // }
+                    // console.log(obj)
+                    this.initChart(obj)
+                }
+            } catch (err) {
+                this.loading = false
+                console.log(err)
+            }
+        },
+        foo() {
+            this.visible = false
+            this.$emit("foo");
+            this.dispose()
+        },
+        initChart(obj) {
+            this.chart = echarts.init(this.$refs.chartContainer);
+            // ...图表配置
+            const option = {
+                title: {
+                    text: obj.title,
+                    textStyle: {
+                        color: "#fff"
+                    }
+                },
+                tooltip: {
+                    trigger: 'axis',
+                    // formatter: function (params) {
+                    //     let index = obj.xAxisData.findIndex(item => item === params[0].value[0])
+                    //     let result = obj.visitName[index] + ' ' + params[0].value[0] + '<br>'; // 显示类目名（如日期）
+                    //     params.forEach(function (item) {
+                    //         result += item.marker + ' ' + item.seriesName + ': ' + item.value[1] + '<br>'; // 显示每个系列的图例、系列名和值
+                    //     });
+                    //     return result;
+                    // }
+                },
+                xAxis: {
+                    // type: 'time',
+                    // data: obj.xAxisData,
+                    data: obj.visitName,
+                    axisLine: { // 设置 x 轴线颜色
+                        lineStyle: {
+                            color: '#fff',
+                        }
+                    },
+                    axisLabel: { // 设置 x 轴文字颜色
+                        textStyle: {
+                            color: '#fff'
+                        }
+                    },
+                    // splitLine: {
+                    //     show: false // 隐藏网格线
+                    // },
+                    // min: obj.min,
+                    // max: obj.max
+                },
+                yAxis: {
+                    name: obj.unit,
+                    type: 'value',
+                    axisLabel: {
+                        textStyle: {
+                            color: '#fff',
+                        }
+                    },
+                    axisLine: {
+                        lineStyle: {
+                            color: '#fff',
+                        }
+                    },
+                },
+                series: obj.series
+            };
+            // 4. 使用配置项渲染图表
+            this.chart.setOption(option);
+        },
+        resize() {
+            if (this.chart) {
+                this.chart.resize()
+            }
+        },
+        dispose() {
+            if (this.chart) {
+                this.chart.dispose()
+                this.chart = null
+            }
+        }
+    },
+};
+</script>
+
+<style lang="scss" scoped>
+.readingChart {
+    min-width: 500px;
+    max-width: 500px;
+    font-size: 14px;
+    display: inline-block;
+    background: #000;
+    border: 1px solid #ebeef5;
+    border-radius: 4px;
+    position: fixed;
+    padding: 10px 6px;
+    list-style-type: none;
+    min-height: 300px;
+    max-height: 80vh;
+    // overflow: hidden;
+    // overflow-y: auto;
+    box-sizing: border-box;
+}
+</style>
--- a/src/components/timeTag/index.vue
+++ b/src/components/timeTag/index.vue
@ -0,0 +1,134 @@
+<template>
+    <div id="timeTag" :style="`color:${suggestionTextColor};background-color: inherit;`">{{ time }}</div>
+</template>
+<script>
+import moment from 'moment'
+export default {
+    name: "timeTag",
+    data() {
+        return {
+            time: '',
+            timer: null,
+            suggestionTextColor: '#909399',
+            resizeObserver: null
+        }
+    },
+    created() {
+        this.getTime()
+    },
+    async mounted() {
+        this.resizeObserver = new ResizeObserver(entries => {
+            entries.forEach(entry => {
+                // 获取元素的新尺寸
+                // const { width, height } = entry.contentRect;
+                // console.log(`元素宽度：${width}px, 高度：${height}px`);
+                // 在此可以将宽高值保存到 data 中
+                // this.elementWidth = width;
+                // this.elementHeight = height;
+                this.dragDoc()
+            });
+        });
+        const body = document.getElementsByTagName('body')[0]
+        // 开始监听指定元素
+        this.resizeObserver.observe(body);
+        this.dragDoc()
+        this.setColor()
+    },
+    methods: {
+        getTime() {
+            if (this.timer) {
+                clearInterval(this.timer)
+                this.timer = null
+            }
+            this.timer = setInterval(async () => {
+                this.time = moment(new Date()).format('YYYY-MM-DD HH:mm:ss Z z')
+            }, 1000)
+        },
+        dragDoc() {
+            const box = document.querySelector('#timeTag')
+            const body = document.getElementsByTagName('body')[0]
+            let maxLeft = body.offsetWidth - box.offsetWidth
+            let maxTop = body.offsetHeight - box.offsetHeight - 30
+            box.style.cssText += `left:${maxLeft}px;top:7px;`
+            const sty = (function () {
+                if (window.document.currentStyle) {
+                    return (dom, attr) => dom.currentStyle[attr]
+                } else {
+                    return (dom, attr) => getComputedStyle(dom, false)[attr]
+                }
+            })()
+
+            box.onmousedown = (e) => {
+                // 鼠标按下，计算当前元素距离可视区的距离
+                const disX = e.clientX - box.offsetLeft
+                const disY = e.clientY - box.offsetTop
+
+                // 获取到的值带px 正则匹配替换
+                let styL = sty(box, 'left')
+                let styT = sty(box, 'top')
+
+                // 注意在ie中 第一次获取到的值为组件自带50% 移动之后赋值为px
+                if (styL.includes('%')) {
+                    styL = +document.body.clientWidth * (+styL.replace(/\%/g, '') / 100)
+                    styT = +document.body.clientHeight * (+styT.replace(/\%/g, '') / 100)
+                } else {
+                    styL = +styL.replace(/\px/g, '')
+                    styT = +styT.replace(/\px/g, '')
+                }
+                const oldMousemove = document.onmousemove
+
+                document.onmousemove = function (e) {
+                    oldMousemove(e)
+                    // 通过事件委托，计算移动的距离
+                    let left = e.clientX - disX
+                    let top = e.clientY - disY
+                    if (left < 0) {
+                        left = 0
+                    }
+                    if (left > maxLeft) {
+                        left = maxLeft
+                    }
+                    if (top < 0) {
+                        top = 0
+                    }
+                    if (top > maxTop) {
+                        top = maxTop
+                    }
+                    // 移动当前元素
+                    box.style.cssText += `;left:${left}px;top:${top}px;`
+                }
+
+                document.onmouseup = function (e) {
+                    document.onmousemove = oldMousemove
+                    document.onmouseup = null
+                }
+            }
+        },
+        setColor() {
+            this.suggestionTextColor = "#909399"
+            let pathList = ['/showvisitdicoms', '/showdicom', '/readingDicoms', '/petct', '/noneDicomReading']
+            if (pathList.includes(window.location.pathname)) {
+                this.suggestionTextColor = "#fff"
+            }
+        }
+    },
+    destroyed() {
+        if (this.timer) {
+            clearInterval(this.timer)
+            this.timer = null
+        }
+        if (this.resizeObserver) {
+            this.resizeObserver.disconnect();
+        }
+    }
+}
+</script>
+<style lang="scss" scoped>
+#timeTag {
+    position: fixed;
+    z-index: 99999;
+    cursor: move;
+    width: 195px;
+    font-size: 14px;
+}
+</style>
--- a/src/components/uploadDicomAndNonedicom/dicomFile.vue
+++ b/src/components/uploadDicomAndNonedicom/dicomFile.vue
@ -10,9 +10,11 @@
    <!--检查列表-->
    <el-table :data="list" style="width: 100%" height="300" :loading="loading">
      <!--受试者-->
-      <el-table-column prop="SubjectCode" :label="$t('upload:dicom:table:subjectCode')" />
+      <el-table-column prop="SubjectCode" :label="$t('upload:dicom:table:subjectCode')" sortable />
+      <!--访视名称-->
+      <el-table-column prop="VisitName" :label="$t('download:table:VisitName')" v-if="IsImageSegment" sortable />
      <!--任务名称-->
-      <el-table-column prop="TaskBlindName" :label="$t('upload:dicom:table:taskBlindName')" />
+      <el-table-column prop="TaskBlindName" :label="$t('upload:dicom:table:taskBlindName')" v-else sortable />
      <!--原始检查数-->
      <el-table-column prop="OrginalStudyList" :label="$t('upload:dicom:table:orginalStudyListNum')">
        <template slot-scope="scope">
@ -40,7 +42,7 @@
        <template slot-scope="scope">
          <div class="btnBox">
            <!--上传--->
-            <form id="inputForm" :ref="`uploadForm_${scope.row.Id}`" enctype="multipart/form-data">
+            <form id="inputForm" :ref="`uploadForm_${scope.row.Id}`" enctype="multipart/form-data" v-if="!forbid">
              <div class="form-group" style="margin-right: 10px">
                <div :id="`directoryInputWrapper_${scope.row.Id}`" class="btn btn-link file-input">
                  <el-button circle icon="el-icon-upload2" :disabled="btnLoading" :loading="btnLoading"
@ -67,7 +69,7 @@
    </el-table>
    <div style="margin: 10px 0" class="top">
      <span>{{ $t('upload:dicom:uploadTitle') }}</span>
-      <div class="btnBox">
+      <div class="btnBox" v-if="!forbid">
        <span style="margin-right: 10px">
          {{ $store.state.trials.uploadTip }}
        </span>
@ -299,7 +301,8 @@
      </el-table-column>
    </el-table>
    <study-view v-if="model_cfg.visible" :model_cfg="model_cfg" :IsDicom="true" :bodyPart="bodyPart"
-      :modelList="modelList" :isUpload="openIsUpload" :TrialModality="TrialModality" @getList="getList" />
+      :subjectVisitId="openSubjectVisitId" :modelList="modelList" :isUpload="openIsUpload"
+      :visitTaskId="openVisitTaskId" :TrialModality="TrialModality" @getList="getList" />
  </div>
 </template>
 <script>
@ -351,6 +354,10 @@ export default {
        return {}
      },
    },
+    forbid: {
+      type: Boolean,
+      default: false,
+    },
    TaskId: {
      type: String,
      default: '',
@ -363,12 +370,17 @@ export default {
      type: Number,
      default: 0,
    },
+    IsImageSegment: {
+      type: Boolean,
+      default: false,
+    }
  },
  components: {
    'study-view': studyView,
  },
  data() {
    return {
+      loading: false,
      list: [],
      StudyInstanceUidList: [],
      SopInstanceUidList: [],
@ -408,6 +420,8 @@ export default {
      open: null,
      bodyPart: {},
      openIsUpload: false,
+      openSubjectVisitId: null,
+      openVisitTaskId: null,
      TrialModality: [],
    }
  },
@ -439,6 +453,12 @@ export default {
        if (this.TaskId) {
          params.VisitTaskId = this.TaskId
        }
+        if (this.IsImageSegment) {
+          params.IsImageSegmentLabel = true
+        }
+        else if (this.Criterion.CriterionType == 19 || this.Criterion.CriterionType == 20) {
+          params.IsImageSegmentLabel = false
+        }
        this.loading = true
        let res = await getSubjectImageUploadList(params)
        this.loading = false
@ -454,7 +474,7 @@ export default {
                data.SubjectId = item.SubejctId
                data.VisitTaskId = item.VisitTaskId
                data.SourceSubjectVisitId = item.SourceSubjectVisitId
-                this.subjectVisitId = item.SourceSubjectVisitId
+                // this.subjectVisitId = item.SourceSubjectVisitId
                this.StudyInstanceUidList.push(data)
              })
            }
@ -488,6 +508,7 @@ export default {
        if (confirm !== 'confirm') return
        let params = {
          VisitTaskId: item.VisitTaskId,
+          SubjectVisitId: item.SourceSubjectVisitId || item.SubjectVisitId,
          IsDicom: true,
        }
        let res = await deleteTaskStudy(params)
@ -520,7 +541,9 @@ export default {
    // 打开弹窗
    handleOpenDialog(item, list, isUpload = false) {
      this.openIsUpload = isUpload
-      this.model_cfg.title = `${item.SubjectCode || ''} > ${item.TaskBlindName}`
+      this.openSubjectVisitId = item.SubjectVisitId || item.SourceSubjectVisitId
+      this.openVisitTaskId = item.VisitTaskId
+      this.model_cfg.title = `${item.SubjectCode || ''} > ${this.IsImageSegment ? item.VisitName : item.TaskBlindName}`
      this.modelList = item[list]
      this.model_cfg.visible = true
    },
@ -536,6 +559,9 @@ export default {
        if (this.VisitTaskId) {
          data.VisitTaskId = this.VisitTaskId
        }
+        if (this.IsImageSegment) {
+          data.IsImageSegmentLabel = true
+        }
        let res = await verifyIRStudyAllowUpload(data)
        if (res.IsSuccess) {
          return res.Result
@ -562,8 +588,9 @@ export default {
          confirmMessage = null
        for (let i = 0; i < checkFiles.length; i++) {
          let item = checkFiles[i]
-          var dicom = await parseDicom(item, 'StudyInstanceUid')
+          var dicom = await parseDicom(item, ['StudyInstanceUid', 'Modality'])
          if (!dicom.StudyInstanceUid) continue
+          if (this.IsImageSegment && dicom.Modality !== 'IVUS') continue
          let has = true,
            has2 = false,
            has3 = false
@ -617,8 +644,8 @@ export default {
        if (this.errStudyUidList && this.errStudyUidList.length > 0) {
          for (let i = 0; i < checkFiles.length; i++) {
            let item = checkFiles[i]
-            var dicom = await parseDicom(item, 'StudyInstanceUid')
-            if (!!~this.errStudyUidList.indexOf(dicom.StudyInstanceUid)) {
+            var dicom = await parseDicom(item, ['StudyInstanceUid', 'Modality'])
+            if (!!~this.errStudyUidList.indexOf(dicom.StudyInstanceUid) || (this.IsImageSegment && dicom.Modality !== 'IVUS')) {
              this.hasOtherStudy = true
              checkFiles.splice(i, 1)
              i--
@ -730,6 +757,13 @@ export default {
                fileList: [],
                dicomInfo: {
                  studyId: data.string('x00200010'),
+                  Manufacturer: data.string('x00080070') || '',
+                  ManufacturerModelName: data.string('x000801090') || '',
+                  DeviceSerialNumber: data.string('x00181000') || '',
+                  DeviceUID: data.string('x00181002') || '',
+                  SoftwareVersions: data.string('x00181020') || '',
+                  PatientWeight: data.string('x00101030') || '',
+
                  DicomStudyDate: data.string('x00080020'),
                  DicomStudyTime: data.string('x00080030'),
                  studyUid: studyUid,
@ -842,6 +876,9 @@ export default {
              )
              seriesItem = {
                seriesUid: seriesUid,
+                RadiopharmaceuticalInformationSequence: data.string('x00540016') || "",
+                AcquisitionDate: data.string('x00080022') || "",
+
                DicomSeriesDate: data.string('x00080021'),
                DicomSeriesTime: data.string('x00080031'),
                seriesNumber: data.intString('x00200011') || 1,
@ -882,6 +919,20 @@ export default {
                instanceTime = time ? `${date} ${time}` : `${date} 00:00:00`
              }
              instanceItem = {
+                PhotometricInterpretation: data.string('x00280004') || '',
+                BitsAllocated: data.uint16('x00280100') || '',
+                PixelRepresentation: data.uint16('x00280103') || '',
+                RescaleIntercept: data.string('x00281052') || '',
+                RescaleSlope: data.string('x00281053') || '',
+                ImagePositionPatient: data.string('x00200032') || '',
+                ImageOrientationPatient: data.string('x00200037') || '',
+                SequenceOfUltrasoundRegions: data.string('x00186011') || '',
+                FrameTime: data.string('x00181063') || '',
+                CorrectedImage: data.string('x00280051') || '',
+                Units: data.string('x00541001') || '',
+                DecayCorrection: data.string('x00541102') || '',
+                EncapsulatedDocument: data.string('x00420011') || '',
+
                instanceUid: instanceUid,
                SOPClassUID: data.string('x00080016'),
                TransferSytaxUID: data.string('x00020010'),
@ -1034,10 +1085,25 @@ export default {
      var scope = this
      return new Promise(function (resolve, reject) {
        try {
+          let subjectVisitId = null;
+          if (scope.VisitTaskId) {
+            scope.StudyInstanceUidList.forEach(item => {
+              if (item.VisitTaskId === scope.VisitTaskId) {
+                subjectVisitId = item.SourceSubjectVisitId
+              }
+            })
+          } else {
+            scope.StudyInstanceUidList.forEach(item => {
+              if (item.StudyInstanceUid === scope.uploadQueues[index].dicomInfo.studyUid) {
+                subjectVisitId = item.SourceSubjectVisitId
+              }
+            })
+          }
+          if (!subjectVisitId) return reject('subjectVisitId is notFind')
          preArchiveDicomStudy({
            trialId: scope.trialId,
            subjectId: scope.SubjectId,
-            subjectVisitId: scope.subjectVisitId,
+            subjectVisitId: subjectVisitId,
            fileSize: scope.uploadQueues[index].dicomInfo.fileSize,
            fileCount: scope.uploadQueues[index].dicomInfo.fileCount,
            IsDicomReUpload:
@ -1053,7 +1119,7 @@ export default {
              dicomInfo.seriesNum = seriesNum
              dicomInfo.fileNum = fileNum
              dicomInfo.subjectId = scope.SubjectId
-              dicomInfo.subjectVisitId = scope.subjectVisitId
+              dicomInfo.subjectVisitId = subjectVisitId
              let t = setInterval(() => {
                dicomUploadInProgress({
                  trialId: scope.trialId,
@ -1073,7 +1139,7 @@ export default {
              let params = {
                trialId: scope.trialId,
                subjectId: scope.SubjectId,
-                subjectVisitId: scope.subjectVisitId,
+                subjectVisitId: subjectVisitId,
                studyMonitorId: res.Result,
                failedFileCount: 0,
                RecordPath: null,
@ -1098,6 +1164,13 @@ export default {
                  DicomStudyDate: dicomInfo.DicomStudyDate,
                  DicomStudyTime: dicomInfo.DicomStudyTime,
                  seriesList: [],
+
+                  Manufacturer: dicomInfo.Manufacturer,
+                  ManufacturerModelName: dicomInfo.ManufacturerModelName,
+                  DeviceSerialNumber: dicomInfo.DeviceSerialNumber,
+                  DeviceUID: dicomInfo.DeviceUID,
+                  SoftwareVersions: dicomInfo.SoftwareVersions,
+                  PatientWeight: dicomInfo.PatientWeight,
                },
              }
              let arr = []
@ -1140,6 +1213,20 @@ export default {
                              windowWidth: o.windowWidth,
                              path: o.myPath,
                              FileSize: o.FileSize,
+
+                              PhotometricInterpretation: o.PhotometricInterpretation,
+                              BitsAllocated: o.BitsAllocated,
+                              PixelRepresentation: o.PixelRepresentation,
+                              RescaleIntercept: o.RescaleIntercept,
+                              RescaleSlope: o.RescaleSlope,
+                              ImagePositionPatient: o.ImagePositionPatient,
+                              ImageOrientationPatient: o.ImageOrientationPatient,
+                              SequenceOfUltrasoundRegions: o.SequenceOfUltrasoundRegions,
+                              FrameTime: o.FrameTime,
+                              CorrectedImage: o.CorrectedImage,
+                              Units: o.Units,
+                              DecayCorrection: o.DecayCorrection,
+                              EncapsulatedDocument: o.EncapsulatedDocument,
                            })
                            Record.Uploaded.push(name)
                            dicomInfo.failedFileCount++
@ -1153,6 +1240,16 @@ export default {
                                o.instanceUid +
                                params.trialId
                              )}`
+                            if (scope.IsImageSegment) {
+                              path = `/${params.trialId}/Image/${params.subjectId
+                                }/${params.subjectVisitId}/AnnotationImage/${dicomInfo.visitTaskId
+                                }/${scope.getGuid(
+                                  dicomInfo.studyUid +
+                                  v.seriesUid +
+                                  o.instanceUid +
+                                  params.trialId
+                                )}`
+                            }
                            if (scope.isClose) return
                            let res = await dcmUpload(
                              {
@ -1186,6 +1283,9 @@ export default {
                                    o.imageRows
                                  )
                                  let thumbnailPath = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.visitTaskId}/${dicomInfo.studyUid}/${v.seriesUid}.jpg`
+                                  if (scope.IsImageSegment) {
+                                    thumbnailPath = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/AnnotationImage/${dicomInfo.visitTaskId}/${dicomInfo.studyUid}/${v.seriesUid}.jpg`
+                                  }
                                  let OSSclient = scope.OSSclient
                                  let seriesRes = await OSSclient.put(
                                    thumbnailPath,
@ -1224,6 +1324,20 @@ export default {
                                windowWidth: o.windowWidth,
                                path: scope.$getObjectName(res.url),
                                FileSize: o.FileSize,
+
+                                PhotometricInterpretation: o.PhotometricInterpretation,
+                                BitsAllocated: o.BitsAllocated,
+                                PixelRepresentation: o.PixelRepresentation,
+                                RescaleIntercept: o.RescaleIntercept,
+                                RescaleSlope: o.RescaleSlope,
+                                ImagePositionPatient: o.ImagePositionPatient,
+                                ImageOrientationPatient: o.ImageOrientationPatient,
+                                SequenceOfUltrasoundRegions: o.SequenceOfUltrasoundRegions,
+                                FrameTime: o.FrameTime,
+                                CorrectedImage: o.CorrectedImage,
+                                Units: o.Units,
+                                DecayCorrection: o.DecayCorrection,
+                                EncapsulatedDocument: o.EncapsulatedDocument,
                              })
                              o.myPath = scope.$getObjectName(res.url)
                              Record.Uploaded.push(name)
@ -1272,11 +1386,17 @@ export default {
                  bodyPartExamined: dicomInfo.bodyPart,
                  instanceList: instanceList,
                  ImageResizePath: ImageResizePath,
+
+                  RadiopharmaceuticalInformationSequence: v.RadiopharmaceuticalInformationSequence,
+                  AcquisitionDate: v.AcquisitionDate,
                })
              }
              let text = JSON.stringify(Record)
              let logJsonBlob = scope.generateTxtFile(text)
              let logJsonObjectName = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.visitTaskId}/${dicomInfo.studyUid}/${params.studyMonitorId}.txt`
+              if (scope.IsImageSegment) {
+                logJsonObjectName = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/AnnotationImage/${dicomInfo.visitTaskId}/${dicomInfo.studyUid}/${params.studyMonitorId}.txt`
+              }
              let logRes
              try {
                logRes = await scope.OSSclient.put(
@ -1305,6 +1425,9 @@ export default {
                    v.instanceList[0].imageRows
                  )
                  let thumbnailPath = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${v.seriesUid}.jpg`
+                  if (scope.IsImageSegment) {
+                    thumbnailPath = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/AnnotationImage/${dicomInfo.studyUid}/${v.seriesUid}.jpg`
+                  }
                  let OSSclient = scope.OSSclient
                  try {
                    let seriesRes = await OSSclient.put(thumbnailPath, blob)
@ -1322,6 +1445,9 @@ export default {
                if (scope.isClose) return false
                console.log(params)
                params.VisitTaskId = dicomInfo.visitTaskId
+                if (scope.IsImageSegment) {
+                  params.IsImageSegmentLabel = true
+                }
                addOrUpdateArchiveTaskStudy(params)
                  .then((res) => {
                    if (dicomInfo.failedFileCount === dicomInfo.fileCount) {
@ -1416,7 +1542,7 @@ export default {
      var token = getToken()
      let trialId = this.$route.query.trialId
      const routeData = this.$router.resolve({
-        path: `/showvisitdicoms?page=upload&trialId=${trialId}&visitTaskId=${row.VisitTaskId}&subjectVisitId=${row.SourceSubjectVisitId}&isReading=1&TokenKey=${token}`,
+        path: `/showvisitdicoms?page=upload&trialId=${trialId}&visitTaskId=${this.IsImageSegment ? 'undefined' : row.VisitTaskId}&subjectVisitId=${row.SourceSubjectVisitId}&isReading=1&TokenKey=${token}`,
      })
      this.open = window.open(routeData.href, '_blank')
    },
--- a/src/components/uploadDicomAndNonedicom/index.vue
+++ b/src/components/uploadDicomAndNonedicom/index.vue
@ -1,40 +1,17 @@
 <template>
-  <el-dialog
-    :visible.sync="visible"
-    :fullscreen="true"
-    :close-on-click-modal="false"
-    :before-close="beforeClose"
-    :append-to-body="true"
-    class="uploadDicomAndNonedicom"
-  >
+  <el-dialog :visible.sync="visible" :fullscreen="true" :close-on-click-modal="false" :before-close="beforeClose"
+    :append-to-body="true" class="uploadDicomAndNonedicom">
    <span slot="title">{{ title }}</span>
    <el-tabs type="border-card" v-model="activeName">
-      <el-tab-pane
-        :label="$t('uploadDicomAndNonedicom:label:dicom')"
-        name="dicom"
-      >
-        <dicomFile
-          v-if="activeName === 'dicom'"
-          :SubjectId="SubjectId"
-          :SubjectCode="SubjectCode"
-          :Criterion="Criterion"
-          :TaskId="VisitTaskId"
-          :isUpload.sync="isUpload"
-          :isReadingTaskViewInOrder="isReadingTaskViewInOrder"
-        />
+      <el-tab-pane :label="$t('uploadDicomAndNonedicom:label:dicom')" name="dicom">
+        <dicomFile v-if="activeName === 'dicom'" :SubjectId="SubjectId" :SubjectCode="SubjectCode"
+          :Criterion="Criterion" :TaskId="VisitTaskId" :isUpload.sync="isUpload"
+          :isReadingTaskViewInOrder="isReadingTaskViewInOrder" :IsImageSegment="IsImageSegment" :forbid="forbid" />
      </el-tab-pane>
-      <el-tab-pane
-        :label="$t('uploadDicomAndNonedicom:label:nonedicom')"
-        name="nonedicom"
-      >
-        <nonedicomFile
-          v-if="activeName === 'nonedicom'"
-          :SubjectId="SubjectId"
-          :SubjectCode="SubjectCode"
-          :Criterion="Criterion"
-          :VisitTaskId="VisitTaskId"
-          :isUpload.sync="isUpload"
-        />
+      <el-tab-pane :label="$t('uploadDicomAndNonedicom:label:nonedicom')" name="nonedicom">
+        <nonedicomFile v-if="activeName === 'nonedicom'" :SubjectId="SubjectId" :SubjectCode="SubjectCode"
+          :Criterion="Criterion" :VisitTaskId="VisitTaskId" :isUpload.sync="isUpload" :IsImageSegment="IsImageSegment"
+          :forbid="forbid" />
      </el-tab-pane>
    </el-tabs>
  </el-dialog>
@ -52,6 +29,10 @@ export default {
      type: Boolean,
      default: false,
    },
+    forbid: {
+      type: Boolean,
+      default: false,
+    },
    SubjectId: {
      type: String,
      default: '',
@ -74,6 +55,10 @@ export default {
      type: Number,
      default: 0,
    },
+    IsImageSegment: {
+      type: Boolean,
+      default: false,
+    }
  },
  data() {
    return {
@ -84,6 +69,7 @@ export default {
  },
  mounted() {
    this.title = `Upload Images：${this.SubjectCode}（${this.Criterion.TrialReadingCriterionName}）`
+    if (this.IsImageSegment) this.title = `Upload Images：${this.SubjectCode}`
    store.dispatch('trials/setUnLock', true)
  },
  methods: {
@ -103,11 +89,13 @@ export default {
 ::v-deep.el-tabs--left .el-tabs__header.is-left {
  margin-right: 0;
 }
+
 .uploadDicomAndNonedicom {
-  ::v-deep.el-tabs--border-card > .el-tabs__header .el-tabs__item {
+  ::v-deep.el-tabs--border-card>.el-tabs__header .el-tabs__item {
    color: #909399;
  }
-  ::v-deep.el-tabs--border-card > .el-tabs__header .el-tabs__item.is-active {
+
+  ::v-deep.el-tabs--border-card>.el-tabs__header .el-tabs__item.is-active {
    color: #428bca;
    background-color: #fff;
    border-right-color: #dcdfe6;
--- a/src/components/uploadDicomAndNonedicom/nonedicomFile.vue
+++ b/src/components/uploadDicomAndNonedicom/nonedicomFile.vue
@ -4,21 +4,27 @@
      <span>{{ $t('upload:nonedicom:title') }}</span>
      <div class="tip">
        <i class="el-icon-warning-outline"></i>
-        <div v-html="$t('upload:nonedicom:tip:message')"></div>
+        <div v-html="$t('upload:nonedicom:tip:message').replace(
+          'xxx',
+          relationInfo.ImageFormatList.join('、')
+        )"></div>
      </div>
    </div>
-    <!--检查列表-->
+    <!--检查列表 @sort-change="handleSortByColumn"-->
    <el-table :data="list" style="width: 100%" v-adaptive="{ bottomOffset: 60 }" :loading="loading"
-      @sort-change="handleSortByColumn" :default-sort="{ prop: 'TaskBlindName', order: 'descending' }">
-      <!--受试者-->
+      :default-sort="{ prop: 'TaskBlindName', order: 'descending' }">
+      <!--受试者 sortable="custom"-->
      <el-table-column prop="SubjectCode" :label="$t('upload:nonedicom:table:subject')" />
+      <!--访视名称-->
+      <el-table-column prop="VisitName" :label="$t('upload:nonedicom:table:VisitName')" sortable
+        v-if="IsImageSegment" />
      <!--任务名称-->
-      <el-table-column prop="TaskBlindName" :label="$t('upload:nonedicom:table:taskName')" sortable="custom" />
+      <el-table-column prop="TaskBlindName" :label="$t('upload:nonedicom:table:taskName')" sortable v-else />
      <!--检查类型-->
-      <el-table-column prop="Modality" :label="$t('upload:nonedicom:table:molityType')" sortable="custom">
+      <el-table-column prop="Modality" :label="$t('upload:nonedicom:table:molityType')" sortable>
      </el-table-column>
      <!--检查部位-->
-      <el-table-column prop="BodyPart" :label="$t('upload:nonedicom:table:bodyPart')" sortable="custom">
+      <el-table-column prop="BodyPart" :label="$t('upload:nonedicom:table:bodyPart')" sortable>
        <template slot-scope="scope">
          <span>{{ getBodyPart(scope.row.BodyPart, scope.row.BodyPartForEditOther) }}</span>
        </template>
@ -103,7 +109,7 @@
          <el-button circle :disabled="scope.row.UploadedFileCount <= 0" icon="el-icon-view"
            :title="$t('upload:nonedicom:button:preview')" @click.stop="handlePreviewNoneDicomFiles(scope.row)" />
          <!--上传--->
-          <el-button circle icon="el-icon-upload2" :title="$t('upload:nonedicom:button:upload')"
+          <el-button circle icon="el-icon-upload2" :title="$t('upload:nonedicom:button:upload')" v-if="!forbid"
            @click.native.prevent="handleUpload(scope.row)" />
          <!--删除--->
          <el-button :disabled="scope.row.UploadedFileCount <= 0 ||
@ -128,7 +134,10 @@
      <!-- 多文件上传 -->
      <form id="inputForm" ref="uploadForm">
        <el-divider content-position="left">{{
-          $t('trials:uploadNonDicoms:label:fileType')
+          $t('trials:uploadNonDicoms:label:fileType').replace(
+            'xxx',
+            relationInfo.ImageFormatList.join('、')
+          )
        }}</el-divider>
        <div class="form-group">
          <div class="upload" style="margin-right: 10px">
@ -219,8 +228,8 @@ let defaultSearchData = () => {
    SubjectId: null,
    TrialReadingCriterionId: null,
    SubjectCode: null,
-    Asc: false,
-    SortField: 'TaskBlindName',
+    // Asc: false,
+    // SortField: 'TaskBlindName',
  }
 }
 export default {
@ -230,6 +239,10 @@ export default {
      type: String,
      default: '',
    },
+    forbid: {
+      type: Boolean,
+      default: false,
+    },
    SubjectCode: {
      type: String,
      default: '',
@ -248,6 +261,10 @@ export default {
      type: Boolean,
      default: false,
    },
+    IsImageSegment: {
+      type: Boolean,
+      default: false,
+    },
  },
  data() {
    return {
@ -266,7 +283,10 @@ export default {
      currentRow: {},
      studyMonitorId: null,
      open: null,
-      BodyPart: {}
+      BodyPart: {},
+      relationInfo: {
+        ImageFormatList: []
+      }
    }
  },
  watch: {
@ -311,11 +331,22 @@ export default {
        if (this.VisitTaskId) {
          this.searchData.VisitTaskId = this.VisitTaskId
        }
+        if (this.IsImageSegment) {
+          this.searchData.IsImageSegmentLabel = true
+        }
+        else if (this.Criterion.CriterionType == 19 || this.Criterion.CriterionType == 20) {
+          this.searchData.IsImageSegmentLabel = false
+        }
        this.loading = true
        let res = await getIRUploadTaskNoneDicomStudyList(this.searchData)
        this.loading = false
        if (res.IsSuccess) {
          this.list = res.Result
+          this.relationInfo = res.OtherInfo
+          this.faccept = []
+          this.relationInfo.ImageFormatList.forEach((item) => {
+            this.faccept.push(`.${item}`)
+          })
        }
      } catch (err) {
        this.loading = false
@ -479,16 +510,16 @@ export default {
      }
    },
    // 排序
-    handleSortByColumn(column) {
-      if (column.order === 'ascending') {
-        this.searchData.Asc = true
-      } else {
-        this.searchData.Asc = false
-      }
-      this.searchData.SortField = column.prop
-      this.searchData.PageIndex = 1
-      this.getList()
-    },
+    // handleSortByColumn(column) {
+    //   if (column.order === 'ascending') {
+    //     this.searchData.Asc = true
+    //   } else {
+    //     this.searchData.Asc = false
+    //   }
+    //   this.searchData.SortField = column.prop
+    //   this.searchData.PageIndex = 1
+    //   this.getList()
+    // },
    // 获取待上传文件信息
    handleSelectionChange(selection) {
      this.selectArr = selection
@ -534,9 +565,15 @@ export default {
      let file = this.fileList.filter((item) => item.id === arr[index].id)[0]
      file.status = 1
      let path = `/${this.$route.query.trialId}/TaskImage/${this.currentRow.SubjectId
-        }/${this.currentRow.VisitTaskId}/${this.$guid()}${file.name
+        }/${this.currentRow.SourceSubjectVisitId}/${this.currentRow.VisitTaskId}/${this.$guid()}${file.name
          .substring(file.name.lastIndexOf('.'))
          .toLocaleLowerCase()}`
+      if (this.IsImageSegment) {
+        path = `/${this.$route.query.trialId}/TaskImage/${this.currentRow.SubjectId
+          }/${this.currentRow.SourceSubjectVisitId}/AnnotationImage/${this.currentRow.VisitTaskId}/${this.$guid()}${file.name
+            .substring(file.name.lastIndexOf('.'))
+            .toLocaleLowerCase()}`
+      }
      file.curPath = path
      const fileData = await this.fileToBlob(file.file)
      let res = await this.fileToOss(path, fileData, file)
@ -620,6 +657,9 @@ export default {
        params.RecordPath = RecordPath.path
        params.FailedFileCount = RecordPath.Record.Failed.length
      }
+      if (this.IsImageSegment) {
+        params.IsImageSegmentLabel = true
+      }
      uploadNoneDicomFile(params)
        .then((res) => {
          if (!isReLoad) {
@ -658,7 +698,10 @@ export default {
          })
          let text = JSON.stringify(Record)
          let logJsonBlob = this.generateTxtFile(text)
-          let logJsonObjectName = `/${this.$route.query.trialId}/TaskImage/${this.currentRow.SubjectId}/${this.currentRow.VisitTaskId}/${this.studyMonitorId}.txt`
+          let logJsonObjectName = `/${this.$route.query.trialId}/TaskImage/${this.currentRow.SubjectId}/${this.currentRow.SourceSubjectVisitId}/${this.currentRow.VisitTaskId}/${this.studyMonitorId}.txt`
+          if (this.IsImageSegment) {
+            logJsonObjectName = `/${this.$route.query.trialId}/TaskImage/${this.currentRow.SubjectId}/${this.currentRow.SourceSubjectVisitId}/AnnotationImage/${this.currentRow.VisitTaskId}/${this.studyMonitorId}.txt`
+          }
          let logRes
          try {
            logRes = await this.OSSclient.put(logJsonObjectName, logJsonBlob)
--- a/src/components/uploadDicomAndNonedicom/study-view.vue
+++ b/src/components/uploadDicomAndNonedicom/study-view.vue
@ -2,6 +2,9 @@
  <div v-if="model_cfg.visible">
    <base-model :config="model_cfg">
      <div slot="dialog-body">
+        <el-button v-if="!isUpload && !isDownload" type='primary' size="small" style="float:right;" @click="preview">
+          {{ $t("common:button:preview") }}
+        </el-button>
        <el-table :data="modelList" style="width: 100%" height="300">
          <!--检查编号-->
          <el-table-column prop="StudyCode" :label="$t('trials:uploadImage:table:StudyCode')" />
@ -39,13 +42,13 @@
          <!--检查时间-->
          <el-table-column prop="ImageDate" :label="$t('trials:uploadImage:table:StudyTime')" v-if="!IsDicom"
            min-width="130" />
-          <el-table-column :label="$t('common:action:action')" fixed="right" width="80">
+          <el-table-column :label="$t('common:action:action')" fixed="right" width="80" v-if="isUpload">
            <template slot-scope="scope">
              <!--预览--->
-              <el-button circle icon="el-icon-view" :title="$t('trials:uploadImage:button:preview')" v-if="!isUpload"
-                @click.stop="preview(scope.row)" />
+              <!-- <el-button circle icon="el-icon-view" :title="$t('trials:uploadImage:button:preview')" v-if="!isUpload"
+                @click.stop="preview(scope.row)" /> -->
              <!--编辑--->
-              <el-button circle icon="el-icon-edit-outline" :title="$t('trials:uploadImage:button:edit')" v-else
+              <el-button circle icon="el-icon-edit-outline" :title="$t('trials:uploadImage:button:edit')"
                @click.stop="openEdit(scope.row)" />
            </template>
          </el-table-column>
@ -109,6 +112,10 @@ export default {
    visitTaskId: {
      type: String,
    },
+    subjectVisitId: {
+      type: String,
+      default: ''
+    },
    IsDicom: {
      required: true,
      type: Boolean,
@ -118,6 +125,20 @@ export default {
      type: Boolean,
      default: false,
    },
+    IsImageSegment: {
+      type: Boolean,
+      default: false,
+    },
+    isDownload: {
+      type: Boolean,
+      default: false,
+    },
+    Criterion: {
+      type: Object,
+      default: () => {
+        return {}
+      },
+    },
  },
  components: {
    'base-model': baseModel,
@ -153,15 +174,23 @@ export default {
      let routeData = null
      if (this.IsDicom) {
        var token = getToken()
+        let trialId = this.$route.query.trialId
        routeData = this.$router.resolve({
-          path: `/showdicom?studyId=${row.Id}&TokenKey=${token}&type=Study&visitTaskId=${this.visitTaskId}&isReading=true`,
+          path: `/showvisitdicoms?trialId=${trialId}&visitTaskId=${this.visitTaskId}&subjectVisitId=${this.subjectVisitId}&isReading=1&TokenKey=${token}`,
        })
      } else {
        let trialId = this.$route.query.trialId
        var token = getToken()
+        if (!this.IsImageSegment && (this.Criterion.CriterionType == 19 || this.Criterion.CriterionType == 20)) {
          routeData = this.$router.resolve({
-          path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${row.SourceSubjectVisitId}&studyId=${row.Id}&TokenKey=${token}&isReading=true`,
+            path: `/showNoneDicoms?trialId=${trialId}&isImageSegmentLabel=${false}&visitTaskId=${this.visitTaskId}&subjectVisitId=${this.subjectVisitId}&TokenKey=${token}&isReading=true`,
          })
+        } else {
+          routeData = this.$router.resolve({
+            path: `/showNoneDicoms?trialId=${trialId}&visitTaskId=${this.visitTaskId}&subjectVisitId=${this.subjectVisitId}&TokenKey=${token}&isReading=true`,
+          })
+        }
+
      }
      window.open(routeData.href, '_blank')
    },
--- a/src/icons/svg/constitution.svg
+++ b/src/icons/svg/constitution.svg
@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1762494352859" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="22987" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M896 832a128 128 0 0 1-128 128H256a128 128 0 0 1-128-128V192a128 128 0 0 1 128-128h512a128 128 0 0 1 128 128v640zM192 768v64a64 64 0 0 0 56.512 63.552L256 896h512a64 64 0 0 0 63.552-56.512L832 832v-64H192z m448-640H512v206.912l64-38.4 64 38.464V128z m-448 576h640V192a64 64 0 0 0-56.512-63.552L768 128h-64v263.488a32 32 0 0 1-48.448 27.456L576 371.2l-79.552 47.744A32 32 0 0 1 448 391.424V128H256a64 64 0 0 0-63.552 56.512L192 192v512z" fill="#e6e6e6" p-id="22988"></path></svg>
--- a/src/icons/svg/crosshairs.svg
+++ b/src/icons/svg/crosshairs.svg
@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1766048712120" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6026" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M924.520311 484.074997c7.439436 0 13.884218 2.726088 19.336394 8.16496 5.437849 5.452175 8.16496 11.897981 8.16496 19.336394 0 7.452739-2.726088 13.898545-8.16496 19.336394-5.452175 5.452175-11.897981 8.16496-19.336394 8.16496l-83.363639 0c-3.437286 40.110533-13.617136 77.777411-30.508851 113.012913-16.906042 35.236526-38.673811 66.175165-65.315588 92.816942s-57.58144 48.422849-92.816942 65.315588c-35.236526 16.906042-72.915683 26.790156-113.012913 29.650297l0 84.223217c0 7.439436-2.726088 13.884218-8.16496 19.336394-5.451152 5.437849-11.896958 8.16496-19.336394 8.16496-7.452739 0-13.898545-2.726088-19.336394-8.16496-5.452175-5.452175-8.16496-11.897981-8.16496-19.336394l0-84.223217c-40.110533-2.860141-77.777411-12.743232-113.012913-29.650297-35.236526-16.892739-66.175165-38.673811-92.816942-65.315588s-48.422849-57.58144-65.315588-92.816942c-16.906042-35.236526-27.071565-72.90238-30.508851-113.012913L99.479689 539.077705c-7.452739 0-13.898545-2.711761-19.336394-8.16496-5.452175-5.437849-8.16496-11.883655-8.16496-19.336394 0-7.439436 2.712785-13.884218 8.16496-19.336394 5.437849-5.437849 11.883655-8.16496 19.336394-8.16496l83.363639 0c3.437286-40.09723 13.602809-77.777411 30.508851-113.012913 16.892739-35.236526 38.673811-66.175165 65.315588-92.816942s57.58144-48.409546 92.816942-65.315588c35.236526-16.892739 72.90238-26.77583 113.012913-29.650297L484.497623 99.05604c0-7.439436 2.712785-13.885242 8.16496-19.336394 5.437849-5.437849 11.883655-8.16496 19.336394-8.16496 7.440459 0 13.885242 2.726088 19.336394 8.16496 5.437849 5.452175 8.16496 11.896958 8.16496 19.336394l0 84.223217c40.098253 2.874467 77.777411 12.757558 113.012913 29.650297 35.236526 16.906042 66.175165 38.673811 92.816942 65.315588s48.409546 57.58144 65.315588 92.816942c16.892739 35.236526 27.071565 72.916706 30.508851 113.012913L924.520311 484.074997zM484.498646 238.281965c-32.657794 2.874467-63.167668 11.320836-91.527576 25.352411-28.360931 14.046924-53.431933 31.946596-75.198679 53.713342-21.781072 21.781072-39.680744 46.837748-53.713342 75.198679-14.045901 28.360931-22.49227 58.869782-25.352411 91.527576L484.498646 484.073974 484.498646 238.281965zM238.70459 539.077705c2.860141 32.657794 11.30651 63.166645 25.352411 91.527576 14.032598 28.360931 31.933293 53.431933 53.713342 75.198679 21.766746 21.781072 46.837748 39.680744 75.198679 53.713342 28.360931 14.046924 58.869782 22.49227 91.527576 25.352411L484.496599 539.077705 238.70459 539.077705zM539.501354 484.074997l245.793032 0c-2.874467-32.657794-11.320836-63.167668-25.352411-91.527576-14.046924-28.360931-31.946596-53.417607-53.713342-75.198679-21.780049-21.766746-46.837748-39.667441-75.198679-53.713342-28.360931-14.032598-58.869782-22.478967-91.527576-25.352411L539.502377 484.074997zM539.501354 784.870738c32.657794-2.860141 63.167668-11.30651 91.527576-25.352411 28.360931-14.032598 53.41863-31.93227 75.198679-53.713342 21.766746-21.766746 39.667441-46.837748 53.713342-75.198679 14.032598-28.360931 22.478967-58.869782 25.352411-91.527576L539.501354 539.078729 539.501354 784.870738z" p-id="6027" fill="#ffffff"></path></svg>
--- a/src/icons/svg/documentation.svg
+++ b/src/icons/svg/documentation.svg
--- a/src/icons/svg/individuation.svg
+++ b/src/icons/svg/individuation.svg
@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1762485648235" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10985" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M543.378286 515.949714V104.521143a31.451429 31.451429 0 0 0-62.976 0v411.501714a125.44 125.44 0 0 0 0.292571 242.834286 31.670857 31.670857 0 0 0-0.292571 3.949714v156.745143a31.451429 31.451429 0 0 0 62.902857 0v-156.745143a31.597714 31.597714 0 0 0-0.219429-3.876571 125.513143 125.513143 0 0 0 0.292572-242.980572z m12.946285 165.814857a62.683429 62.683429 0 1 1-88.649142-88.722285 62.683429 62.683429 0 0 1 88.649142 88.722285zM229.522286 202.459429a31.597714 31.597714 0 0 0 0.292571-3.949715V104.594286a31.305143 31.305143 0 1 0-62.610286 0v93.988571c0 1.389714 0 2.706286 0.146286 4.022857a125.44 125.44 0 0 0 0 242.907429 31.670857 31.670857 0 0 0-0.146286 3.876571v470.235429a31.305143 31.305143 0 1 0 62.610286 0V449.316571a31.597714 31.597714 0 0 0-0.292571-3.803428 125.44 125.44 0 0 0 0-243.053714z m13.312 165.888a62.683429 62.683429 0 1 1-88.649143-88.722286 62.683429 62.683429 0 0 1 88.649143 88.722286zM950.857143 324.022857c0-58.587429-40.228571-107.739429-94.500572-121.563428a31.670857 31.670857 0 0 0 0.146286-3.949715V104.594286a31.305143 31.305143 0 0 0-62.610286 0v93.988571c0 1.389714 0.146286 2.706286 0.292572 4.022857a125.44 125.44 0 0 0 0 242.907429 31.670857 31.670857 0 0 0-0.292572 3.949714v470.162286a31.305143 31.305143 0 1 0 62.610286 0V449.389714c0-1.316571 0-2.56-0.146286-3.876571A125.513143 125.513143 0 0 0 950.857143 324.022857z m-81.042286 44.324572a62.683429 62.683429 0 1 1-88.649143-88.722286 62.683429 62.683429 0 0 1 88.649143 88.722286z" p-id="10986" fill="#e6e6e6"></path></svg>
--- a/src/icons/svg/mpr.svg
+++ b/src/icons/svg/mpr.svg
@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1764830990216" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5566" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M192 170.666667a21.333333 21.333333 0 0 0-21.333333 21.333333v640a21.333333 21.333333 0 0 0 21.333333 21.333333h640a21.333333 21.333333 0 0 0 21.333333-21.333333v-640a21.333333 21.333333 0 0 0-21.333333-21.333333h-640zM85.333333 192A106.666667 106.666667 0 0 1 192 85.333333h640A106.666667 106.666667 0 0 1 938.666667 192v640a106.666667 106.666667 0 0 1-106.666667 106.666667h-640A106.666667 106.666667 0 0 1 85.333333 832v-640z" fill="#ffffff" p-id="5567"></path><path d="M173.653333 170.666667c-1.621333 5.034667-2.986667 12.373333-2.986666 21.333333v640c0 8.96 1.365333 16.298667 2.986666 21.333333h292.693334c1.621333-5.034667 2.986667-12.373333 2.986666-21.333333v-640c0-8.96-1.365333-16.298667-2.986666-21.333333H173.653333zM99.157333 127.658667C107.306667 111.530667 126.293333 85.333333 160 85.333333h320c33.706667 0 52.736 26.197333 60.8 42.325334 9.301333 18.688 13.866667 41.472 13.866667 64.341333v640c0 22.869333-4.565333 45.653333-13.866667 64.341333-8.106667 16.128-27.093333 42.325333-60.8 42.325334h-320c-33.706667 0-52.736-26.197333-60.8-42.325334C89.856 877.653333 85.333333 854.869333 85.333333 832v-640c0-22.869333 4.522667-45.653333 13.866667-64.341333z" fill="#ffffff" p-id="5568"></path><path d="M170.666667 170.666667v298.666666h298.666666V170.666667H170.666667z m-85.333334-10.666667C85.333333 118.784 118.784 85.333333 160 85.333333h320c41.216 0 74.666667 33.450667 74.666667 74.666667v320A74.666667 74.666667 0 0 1 480 554.666667h-320A74.666667 74.666667 0 0 1 85.333333 480v-320z" fill="#ffffff" p-id="5569"></path></svg>
--- a/src/icons/svg/readingChart.svg
+++ b/src/icons/svg/readingChart.svg
@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1763446648844" class="icon" viewBox="0 0 1321 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3570" xmlns:xlink="http://www.w3.org/1999/xlink" width="258.0078125" height="200"><path d="M1187.981 845.871H200.885V120.065C200.885 91.032 177.659 62 142.82 62s-58.064 23.226-58.064 58.065v783.87c0 29.033 23.225 58.065 58.064 58.065h1045.161c29.033 0 58.065-23.226 58.065-58.065s-29.032-58.064-58.065-58.064z" fill="#1296db" p-id="3571"></path><path d="M287.981 317.484L555.078 485.87c11.613 5.806 17.42 5.806 29.032 5.806 17.42 0 34.84-5.806 46.452-23.225l185.806-255.484 191.613 145.161c23.226 17.42 58.065 11.613 75.484-11.613 17.42-23.226 11.613-58.064-11.613-75.484L839.594 96.84c-23.226-17.42-58.064-11.613-75.484 11.613L572.497 363.935 346.046 224.581c-23.226-17.42-58.065-5.807-75.484 17.419s-5.806 58.065 17.42 75.484z m29.033 505.161c29.032 0 58.064-23.226 58.064-58.064V532.323c0-29.033-23.226-58.065-58.064-58.065s-58.065 23.226-58.065 58.065v238.064c5.807 29.032 29.032 52.258 58.065 52.258zM502.82 619.42v150.968c0 29.032 23.226 58.065 58.065 58.065s58.064-23.226 58.064-58.065V619.42c0-29.032-23.226-58.064-58.064-58.064s-58.065 29.032-58.065 58.064z" fill="#1296db" p-id="3572"></path><path d="M740.885 416.194v354.193c0 29.032 23.225 58.065 58.064 58.065s58.065-23.226 58.065-58.065V416.194c0-29.033-23.226-58.065-58.065-58.065s-58.064 29.032-58.064 58.065z m296.129 92.903c-29.033 0-58.065 23.226-58.065 58.064v203.226c0 29.032 23.226 58.065 58.065 58.065s58.064-23.226 58.064-58.065V567.161c0-29.032-29.032-58.064-58.064-58.064z" fill="#1296db" p-id="3573"></path></svg>
--- a/src/lang/en.js
+++ b/src/lang/en.js
@ -1608,7 +1608,7 @@ Enroll: Enrolled Confirmation`,
 		'trials:notice:table:appendix': `Attachment`,
 		'trials:notice:table:isRead': `Readed`,
 		'trials:notice:action:detail': `Details`,
-		'login:title:system': `IRC Imaging System`,
+		'login:title:system': `EIC lmaging Trial Management System`,
 		'login:form:userName': `User ID`,
 		'login:form:password': `Password`,
 		'login:button:login': `Login`,
@ -1672,7 +1672,7 @@ Enroll: Enrolled Confirmation`,
 		'trials:tab:trials': `My Trials`,
 		'trials:trials:title:back': `Return`,
 		'trials:trials:title:backTrialList': `Return to trial list`,
-		'trials:trials:title:eics': `IRC Imaging System`,
+		'trials:trials:title:eics': `EIC lmaging Trial Management System`,
 		'trials:tab:reading': `Reads`,
 		'trials:tab:pendingReadingTasks': `Pending`,
 		'trials:pendingReadingTasks:table:subjectCode': `Subject ID`,
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@ -218,7 +218,7 @@ export default {
  .right-menu {
    // float: right;
    height: 100%;
-    line-height: 50px;
+    line-height: 65px;
    // position: relative;
    &:focus {
      outline: none;
--- a/src/layout/components/Sidebar/SidebarItem.vue
+++ b/src/layout/components/Sidebar/SidebarItem.vue
@ -3,14 +3,16 @@
    <template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow">
      <app-link v-if="!onlyOneChild.hidden" :to="resolvePath(onlyOneChild.path)">
        <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}" @click="handleClick(onlyOneChild.meta.title)">
-          <item :icon="onlyOneChild.meta ? (onlyOneChild.meta.icon||(item.meta&&item.meta.icon)) : null" :title="onlyOneChild.meta ? onlyOneChild.meta.title : null" />
+          <!-- :title="onlyOneChild.meta ? onlyOneChild.meta.title : null" -->
+          <item :icon="onlyOneChild.meta ? (onlyOneChild.meta.icon||(item.meta&&item.meta.icon)) : null" :title="onlyOneChild.meta.i18n ? $t(onlyOneChild.meta.i18n) : null" />
        </el-menu-item>
      </app-link>
    </template>

    <el-submenu v-else ref="subMenu" :index="resolvePath(item.path)" popper-append-to-body>
      <template slot="title">
-        <item v-if="item.meta" :icon="item.meta && item.meta.icon" :title="item.meta.title" />
+        <!-- :title="item.meta.title" -->
+        <item v-if="item.meta" :icon="item.meta && item.meta.icon" :title="item.meta.i18n ? $t(item.meta.i18n) : null" />
      </template>
      <sidebar-item
        v-for="child in item.children"
--- a/src/layout/components/topLang.vue
+++ b/src/layout/components/topLang.vue
@ -1,11 +1,11 @@
 <template>
  <el-dropdown
-    style="height:50px;line-height: 60px;"
+    style="height:50px;line-height: 65px;"
    @command="handleSetLanguage"
  >

    <span class="el-dropdown-link">
-      <svg-icon icon-class="language" style="font-size:25px;margin:0 10px;" />
+      <svg-icon icon-class="language" style="font-size:20px;margin:0 10px;" />
      <!-- {{ language==='zh'?'语言：中文':'Language: English' }} -->
      <!-- <i class="el-icon-arrow-down el-icon--right" /> -->
    </span>
--- a/src/main.js
+++ b/src/main.js
@ -26,8 +26,9 @@ Vue.use(VueClipboard)
 import permission from './utils/permission'
 Vue.use(permission)

-import { formatSize } from "./utils"
+import { formatSize, guidToColor } from "./utils"
 Vue.prototype.$FormatSize = formatSize
+Vue.prototype.$GuidToColor = guidToColor

 import Viewer from 'v-viewer'
 import './assets/css/viewer.css'
@ -61,6 +62,8 @@ import Onlyoffice from '@/components/Preview_onlyoffice/index'
 Vue.use(Onlyoffice)
 import Video from '@/components/Preview_video/index'
 Vue.use(Video)
+import AGR from '@/components/AGR/index'
+Vue.use(AGR)
 import MFA from '@/components/MFA/index'
 Vue.use(MFA)
 import FB from '@/components/feedBack/index'
--- a/src/router/index.js
+++ b/src/router/index.js
@ -79,6 +79,12 @@ export const constantRoutes = [
    name: 'emailRecompose',
    hidden: true
  },
+  {
+    path: '/user-recompose',
+    component: () => import('@/views/email-recompose/index'),
+    name: 'userRecompose',
+    hidden: true
+  },
  {
    path: '/joinVerify',
    component: () => import('@/views/joinVerify/index'),
--- a/src/settings.js
+++ b/src/settings.js
@ -1,7 +1,7 @@
 // eslint-disable-next-line no-undef
 module.exports = {

-  title: 'IRC Imaging System',
+  title: 'EIC lmaging Trial Management System',

  /**
 * @type {boolean} true | false
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@ -39,6 +39,7 @@ function filterAsyncRouter(asyncRouterMap = [], lastRouter = false, type = false
      // eslint-disable-next-line
      route.meta = eval('(' + route.Meta + ')')
      route.meta.icon = route.MenuIcon
+      route.meta.i18n = route.LanguageMark
      delete route.Meta
    }
    delete route.MenuIcon
--- a/src/store/modules/reading.js
+++ b/src/store/modules/reading.js
@ -40,6 +40,13 @@ function getQuestions(questions) {
  const criterionType = parseInt(localStorage.getItem('CriterionType'))
  questions.forEach(item => {
    if ((item.Type === 'table' || item.Type === 'basicTable') && item.TableQuestions && item.TableQuestions.Answers.length > 0) {
+      item.TableQuestions.Questions.forEach(question => {
+        if (question.Type === 'select' && question.OptionTypeEnum === 1) {
+          item.TableQuestions.Answers.forEach((answer) => {
+            answer[question.Id] = answer[question.Id] ? JSON.parse(answer[question.Id]) : []
+          })
+        }
+      })
      item.TableQuestions.Answers.forEach(answerObj => {
        answerObj.isDicomReading = answerObj.IsDicomReading === 'True'

--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@ -276,6 +276,14 @@ const actions = {
  async logout({ commit, state }) {
    try {
      removeToken() // must remove  token  first
+      let data = {
+        IdentityUserId: zzSessionStorage.getItem('identityUserId')
+      }
+      if (zzSessionStorage.getItem('userId') && zzSessionStorage.getItem('userId') !== 'undefined') {
+        data.UserRoleId = zzSessionStorage.getItem('userId')
+      } else {
+        data.UserRoleId = null
+      }
      await loginOut({
        UserRoleId: zzSessionStorage.getItem('userId'),
        IdentityUserId: zzSessionStorage.getItem('identityUserId'),
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@ -358,3 +358,17 @@ body .el-table th.gutter {
 .el-message-box__wrapper {
  z-index: 9999 !important;
 }
+
+.svg-readingChart {
+  width: 28px !important;
+  height: 30px !important;
+  margin-left: 10px;
+  cursor: pointer;
+}
+
+.svg-readingChart-mini {
+  width: 18px !important;
+  height: 20px !important;
+  vertical-align: -0.4em !important;
+  cursor: pointer;
+}
--- a/src/utils/customSort.js
+++ b/src/utils/customSort.js
@ -0,0 +1,346 @@
+class FileNameSorter {
+    /**
+     * 判断是否为纯数字字符串
+     * @param {any} value - 要检查的值
+     * @returns {boolean} 是否为纯数字
+     */
+    static isPureNumber(value) {
+        if (typeof value !== 'string') return false;
+        return /^\d+$/.test(value);
+    }
+
+    /**
+     * 获取排序键值
+     * @param {any} item - 要排序的项目
+     * @returns {Array} 排序键值数组
+     */
+    static getSortKey(item) {
+        const str = String(item);
+        const isNumber = this.isPureNumber(str);
+
+        // 排序优先级: [类型优先级, 数字值/字符串值]
+        if (isNumber) {
+            // 纯数字: 类型优先级为0, 使用数字值排序
+            return [0, BigInt(str)];
+        } else {
+            // 非纯数字: 类型优先级为1, 使用字符串排序
+            return [1, str.toLowerCase()];
+        }
+    }
+
+    /**
+     * 文件名排序
+     * @param {Array} arr - 要排序的数组
+     * @param {Object} options - 排序选项
+     * @returns {Array} 排序后的数组
+     */
+    static sortFileNames(arr, options = {}) {
+        if (!Array.isArray(arr)) {
+            throw new TypeError('输入必须是一个数组');
+        }
+
+        const {
+            direction = 'asc', // 'asc' 升序, 'desc' 降序
+            caseSensitive = false, // 是否区分大小写
+            trim = true, // 是否去除前后空格
+            key = null
+        } = options;
+
+        // 创建数组的副本
+        const result = [...arr];
+
+        return result.sort((a, b) => {
+            let aStr = key ? String(a[key]).split(".")[0] : String(a);
+            let bStr = key ? String(b[key]).split(".")[0] : String(b);
+            // 处理空格
+            if (trim) {
+                aStr = aStr.trim();
+                bStr = bStr.trim();
+            }
+
+            // 处理大小写
+            if (!caseSensitive) {
+                aStr = aStr.toLowerCase();
+                bStr = bStr.toLowerCase();
+            }
+
+            // 获取排序键值
+            const aKey = this.getSortKey(aStr);
+            const bKey = this.getSortKey(bStr);
+
+            // 比较类型优先级
+            if (aKey[0] !== bKey[0]) {
+                // 纯数字(0) < 非纯数字(1)
+                return direction === 'asc' ? aKey[0] - bKey[0] : bKey[0] - aKey[0];
+            }
+
+            // 相同类型下的比较
+            if (aKey[0] === 0) {
+                // 都是纯数字，按数字大小比较
+                if (aKey[1] < bKey[1]) return direction === 'asc' ? -1 : 1;
+                if (aKey[1] > bKey[1]) return direction === 'asc' ? 1 : -1;
+                return 0;
+            } else {
+                // 都是非纯数字，按字符串比较
+                if (aStr < bStr) return direction === 'asc' ? -1 : 1;
+                if (aStr > bStr) return direction === 'asc' ? 1 : -1;
+                return 0;
+            }
+        });
+    }
+
+    /**
+     * 自然排序 - 处理文件名中的数字序列
+     * 例如: file1, file2, file10
+     * @param {Array} arr - 要排序的数组
+     * @param {Object} options - 排序选项
+     * @returns {Array} 排序后的数组
+     */
+    static naturalSort(arr, options = {}) {
+        const {
+            direction = 'asc',
+            caseSensitive = false
+        } = options;
+
+        return [...arr].sort((a, b) => {
+            const aStr = String(a);
+            const bStr = String(b);
+
+            // 检查是否都是纯数字
+            const aIsPureNumber = this.isPureNumber(aStr);
+            const bIsPureNumber = this.isPureNumber(bStr);
+
+            // 如果一个纯数字，一个非纯数字
+            if (aIsPureNumber && !bIsPureNumber) {
+                return direction === 'asc' ? -1 : 1;
+            }
+            if (!aIsPureNumber && bIsPureNumber) {
+                return direction === 'asc' ? 1 : -1;
+            }
+
+            // 都是纯数字，按数字比较
+            if (aIsPureNumber && bIsPureNumber) {
+                const aNum = BigInt(aStr);
+                const bNum = BigInt(bStr);
+
+                if (aNum < bNum) return direction === 'asc' ? -1 : 1;
+                if (aNum > bNum) return direction === 'asc' ? 1 : -1;
+                return 0;
+            }
+
+            // 都是非纯数字，使用自然排序算法
+            return this.naturalCompare(aStr, bStr, direction, caseSensitive);
+        });
+    }
+
+    /**
+     * 自然比较算法
+     * @private
+     */
+    static naturalCompare(a, b, direction = 'asc', caseSensitive = false) {
+        let aStr = caseSensitive ? a : a.toLowerCase();
+        let bStr = caseSensitive ? b : b.toLowerCase();
+
+        const regex = /(\d+|\D+)/g;
+        const aParts = aStr.match(regex) || [];
+        const bParts = bStr.match(regex) || [];
+
+        const maxLength = Math.max(aParts.length, bParts.length);
+
+        for (let i = 0; i < maxLength; i++) {
+            const aPart = aParts[i] || '';
+            const bPart = bParts[i] || '';
+
+            const aIsNumber = /^\d+$/.test(aPart);
+            const bIsNumber = /^\d+$/.test(bPart);
+
+            // 如果都是数字，按数字比较
+            if (aIsNumber && bIsNumber) {
+                const aNum = BigInt(aPart);
+                const bNum = BigInt(bPart);
+
+                if (aNum < bNum) return direction === 'asc' ? -1 : 1;
+                if (aNum > bNum) return direction === 'asc' ? 1 : -1;
+                continue;
+            }
+
+            // 都是文本，按字符串比较
+            if (aPart < bPart) return direction === 'asc' ? -1 : 1;
+            if (aPart > bPart) return direction === 'asc' ? 1 : -1;
+        }
+
+        return 0;
+    }
+
+    /**
+     * 分组排序 - 将纯数字和非纯数字分开显示
+     * @param {Array} arr - 要排序的数组
+     * @param {Object} options - 排序选项
+     * @returns {Array} 排序后的数组
+     */
+    static groupSort(arr, options = {}) {
+        const {
+            direction = 'asc',
+            groupOrder = 'numbers-first' // 'numbers-first' 或 'names-first'
+        } = options;
+
+        // 分组
+        const numbers = [];
+        const names = [];
+
+        arr.forEach(item => {
+            const str = String(item);
+            if (this.isPureNumber(str)) {
+                numbers.push(item);
+            } else {
+                names.push(item);
+            }
+        });
+
+        // 对各组排序
+        const sortedNumbers = this.sortFileNames(numbers, { direction });
+        const sortedNames = this.sortFileNames(names, { direction });
+
+        // 按指定顺序合并
+        if (groupOrder === 'numbers-first') {
+            return [...sortedNumbers, ...sortedNames];
+        } else {
+            return [...sortedNames, ...sortedNumbers];
+        }
+    }
+
+    /**
+     * 文件扩展名排序 - 先按扩展名排序，再按文件名排序
+     * @param {Array} arr - 要排序的数组
+     * @param {Object} options - 排序选项
+     * @returns {Array} 排序后的数组
+     */
+    static sortByExtension(arr, options = {}) {
+        const {
+            direction = 'asc',
+            extensionsFirst = false // 扩展名优先还是文件名优先
+        } = options;
+
+        return [...arr].sort((a, b) => {
+            const aStr = String(a);
+            const bStr = String(b);
+
+            // 分离文件名和扩展名
+            const getFileParts = (str) => {
+                const lastDotIndex = str.lastIndexOf('.');
+                if (lastDotIndex > 0) {
+                    return {
+                        name: str.substring(0, lastDotIndex),
+                        ext: str.substring(lastDotIndex + 1)
+                    };
+                }
+                return { name: str, ext: '' };
+            };
+
+            const aParts = getFileParts(aStr);
+            const bParts = getFileParts(bStr);
+
+            let compareResult;
+
+            if (extensionsFirst) {
+                // 先比较扩展名
+                compareResult = this.sortFileNames([aParts.ext, bParts.ext], { direction })[0] === aParts.ext ? -1 : 1;
+                if (compareResult !== 0) return compareResult;
+
+                // 扩展名相同，再比较文件名
+                return this.sortFileNames([aParts.name, bParts.name], { direction })[0] === aParts.name ? -1 : 1;
+            } else {
+                // 先比较文件名
+                compareResult = this.sortFileNames([aParts.name, bParts.name], { direction })[0] === aParts.name ? -1 : 1;
+                if (compareResult !== 0) return compareResult;
+
+                // 文件名相同，再比较扩展名
+                return this.sortFileNames([aParts.ext, bParts.ext], { direction })[0] === aParts.ext ? -1 : 1;
+            }
+        });
+    }
+
+    /**
+     * 测试和演示函数
+     */
+    static demonstrate() {
+        const testData = [
+            '100',
+            '23',
+            '1',
+            '003',
+            'file.txt',
+            '10',
+            '5',
+            'alpha',
+            'beta',
+            'gamma',
+            '00100',
+            'zebra',
+            'apple',
+            'banana',
+            '123',
+            'file10.txt',
+            'file2.txt',
+            'File1.txt',
+            'file20.txt',
+            'image.jpg',
+            'document.pdf',
+            'data.xlsx'
+        ];
+
+        console.log('=== 文件名排序演示 ===\n');
+
+        console.log('原始数据:');
+        console.log(testData);
+
+        console.log('\n1. 基本排序 (纯数字 < 非纯数字):');
+        const basicSorted = this.sortFileNames(testData);
+        console.log(basicSorted);
+
+        console.log('\n2. 自然排序 (智能数字识别):');
+        const naturalSorted = this.naturalSort(testData);
+        console.log(naturalSorted);
+
+        console.log('\n3. 分组排序 (数字组和文件组):');
+        const groupSorted = this.groupSort(testData);
+        console.log(groupSorted);
+
+        console.log('\n4. 降序排序:');
+        const descSorted = this.sortFileNames(testData, { direction: 'desc' });
+        console.log(descSorted);
+
+        console.log('\n5. 按扩展名排序:');
+        const extSorted = this.sortByExtension(testData);
+        console.log(extSorted);
+
+        console.log('\n6. 大小写敏感排序:');
+        const caseSensitiveSorted = this.sortFileNames(testData, { caseSensitive: true });
+        console.log(caseSensitiveSorted);
+
+        // 验证排序规则
+        console.log('\n=== 排序规则验证 ===');
+        const validationData = ['100', '23', 'file.txt', '1', 'alpha', '003', '10'];
+        console.log('验证数据:', validationData);
+        console.log('排序结果:', this.sortFileNames(validationData));
+        console.log('规则验证:');
+        console.log('  - 纯数字: 1, 3(003), 10, 23, 100 (按数字大小)');
+        console.log('  - 非纯数字: alpha, file.txt (按字母顺序)');
+        console.log('  - 非纯数字 > 纯数字');
+
+        return {
+            basic: basicSorted,
+            natural: naturalSorted,
+            group: groupSorted,
+            descending: descSorted,
+            byExtension: extSorted,
+            caseSensitive: caseSensitiveSorted
+        };
+    }
+}
+
+if (typeof module !== 'undefined' && module.exports) {
+    module.exports = FileNameSorter;
+} else if (typeof window !== 'undefined') {
+    window.FileNameSorter = FileNameSorter;
+}
--- a/src/utils/dcmUpload/dcmjs.js
+++ b/src/utils/dcmUpload/dcmjs.js
@ -8508,6 +8508,8 @@
 	      var binaryStream;
 	      var _writeOptions$fragmen = writeOptions.fragmentMultiframe,
 	          fragmentMultiframe = _writeOptions$fragmen === void 0 ? true : _writeOptions$fragmen;
+		  var _writeOptions$offset = writeOptions.startOffset,
+	          isNeedStartOffset = _writeOptions$offset === void 0 ? true : _writeOptions$offset;
 	      value = value === null || value === undefined ? [] : value;

 	      if (isEncapsulated) {
@ -8535,7 +8537,9 @@
 	        for (i = 0; i < frames; i++) {
 	          var _needsPadding = Boolean(value[i].byteLength & 1);

+	          if (isNeedStartOffset) {
 				 startOffset.push(binaryStream.size);
+			  }
 	          var frameBuffer = value[i],
 	              frameStream = new ReadBufferStream(frameBuffer);
 	          var fragmentsLength = 1;
--- a/src/utils/fingerprint.js
+++ b/src/utils/fingerprint.js
@ -0,0 +1,32 @@
+import FingerprintJS from '@fingerprintjs/fingerprintjs';
+
+export const customAgent = () => {
+    return new Promise(async resolve => {
+        const fpPromise = await FingerprintJS.load({
+            monitoring: false
+        });
+        const result = await fpPromise.get({
+            products: ['fonts', 'screen', 'canvas'],
+            extendedData: true,
+            debug: false
+        })
+        // const filteredComponents = Object.fromEntries(
+        //     Object.entries(result.components)
+        //         .filter(([key, value]) => value.confidence > 0.5)
+        // );
+
+        resolve({
+            ...result,
+        });
+        // fpPromise
+        //     .then(fp => fp.get({
+        //         products: ['fonts', 'screen', 'canvas'],
+        //         extendedData: true,
+        //         debug: true
+        //     }))
+        //     .then(result => {
+        //         // 自定义数据转换
+
+        //     });
+    });
+}
--- a/src/utils/get-page-title.js
+++ b/src/utils/get-page-title.js
@ -1,6 +1,6 @@
 import defaultSettings from '@/settings'

-const title = defaultSettings.title || 'IRC Imaging System'
+const title = defaultSettings.title || 'EIC lmaging Trial Management System'

 export default function getPageTitle(pageTitle) {
  if (pageTitle) {
--- a/src/utils/index.js
+++ b/src/utils/index.js
@ -197,3 +197,109 @@ export function workSpeedclose(isForce = false) {
  imageId = null;
  percentageById = {};
 }
+function readDirectoryEntries(directoryReader) {
+  return new Promise((resolve, reject) => {
+    let entries = [];
+    function readBatch() {
+      directoryReader.readEntries(
+        (results) => {
+          if (results.length) {
+            entries = entries.concat(results);
+            readBatch();
+          } else {
+            resolve(entries);
+          }
+        },
+        (error) => reject(error)
+      );
+    }
+    readBatch();
+  });
+}
+export async function readEntry(entry) {
+  const files = [];
+
+  // 如果是文件夹，创建读取器并递归读取其内容
+  if (entry.isDirectory) {
+    const directoryReader = entry.createReader();
+    const entries = await readDirectoryEntries(directoryReader)
+    // 递归读取文件夹内的每一项
+    for (const subEntry of entries) {
+      const subFiles = await readEntry(subEntry);
+      files.push(...subFiles);
+    }
+  }
+  // 如果是文件，则将其转换为File对象
+  else if (entry.isFile) {
+    const file = await new Promise((resolve, reject) => {
+      entry.file(resolve, reject); // entry.file()是异步的
+    });
+    files.push(file);
+  }
+
+  return files;
+}
+// 使用FNV-1a哈希算法确保相同GUID产生相同结果
+function fnv1aHash(str) {
+  const FNV_OFFSET_BASIS = 2166136261;
+  const FNV_PRIME = 16777619;
+
+  let hash = FNV_OFFSET_BASIS;
+  for (let i = 0; i < str.length; i++) {
+    hash ^= str.charCodeAt(i);
+    hash = (hash * FNV_PRIME) >>> 0; // 使用无符号右移确保结果为无符号32位整数
+  }
+  return hash;
+}
+// RGB转十六进制
+function rgbToHex(r, g, b) {
+  return "#" + ((1 << 24) + (r << 16) + (g << 8) + b).toString(16).slice(1).toUpperCase();
+}
+// HSL转RGB函数
+function hslToRgb(h, s, l) {
+  let r, g, b;
+
+  if (s === 0) {
+    r = g = b = l; // 灰色
+  } else {
+    const hue2rgb = (p, q, t) => {
+      if (t < 0) t += 1;
+      if (t > 1) t -= 1;
+      if (t < 1 / 6) return p + (q - p) * 6 * t;
+      if (t < 1 / 2) return q;
+      if (t < 2 / 3) return p + (q - p) * (2 / 3 - t) * 6;
+      return p;
+    };
+
+    const q = l < 0.5 ? l * (1 + s) : l + s - l * s;
+    const p = 2 * l - q;
+
+    r = hue2rgb(p, q, h + 1 / 3);
+    g = hue2rgb(p, q, h);
+    b = hue2rgb(p, q, h - 1 / 3);
+  }
+
+  return { r, g, b };
+}
+export function guidToColor(guid) {
+  // 移除GUID中的连字符和花括号（如果有）
+  let cleanGuid = guid.replace(/[{}()-]/g, '');
+  // 计算GUID的哈希值
+  const hash = fnv1aHash(cleanGuid);
+
+  // 使用哈希值生成HLS颜色（确保高区分度）
+  // 将哈希值映射到0-1之间
+  const h = (hash & 0xFFFF) / 0xFFFF; // 使用前16位作为色相
+  const s = ((hash >> 16) & 0xFF) / 0xFF * 0.6 + 0.4; // 饱和度在0.4-1.0之间
+  const l = ((hash >> 24) & 0xFF) / 0xFF * 0.4 + 0.4; // 亮度在0.3-0.7之间，避免太暗或太亮
+
+  // 返回RGB对象
+  let rgb = hslToRgb(h, s, l);
+  let obj = {
+    r: Math.round(rgb.r * 255),
+    g: Math.round(rgb.g * 255),
+    b: Math.round(rgb.b * 255)
+  }
+  let str = rgbToHex(obj.r, obj.g, obj.b)
+  return str;
+}
--- a/src/utils/request.js
+++ b/src/utils/request.js
@ -5,8 +5,10 @@ import router from '@/router'
 import WHITELIST from "./whiteList"
 import moment from 'moment-timezone';
 import { encryptConfig } from "@/utils/encrypt"
+import SystemInfo from "@/utils/systemInfo";
 const ROUTER = require('@/router');
 axios.defaults.withCredentials = false
+const systemInfo = new SystemInfo();
 const service = axios.create({
  baseURL: '/api',
  // baseURL: process.env.NODE_ENV === 'prod' ? "https://api.irc.extimaging.com" : '/api',
@ -26,6 +28,40 @@ service.interceptors.request.use(
    var language = zzSessionStorage.getItem('lang')
    config.headers['Accept-Language'] = language === 'en' ? 'en-US,en;q=0.5' : 'zh-CN,zh;q=0.9'
    config.headers['TimeZoneId'] = moment.tz.guess()
+    const allInfo = systemInfo.getAllInfo();
+    let obj = {
+      browser: {
+        name: allInfo.browser.name,
+        version: allInfo.browser.version,
+      },
+      platform: allInfo.platform,
+      os: {
+        name: allInfo.os.name,
+        version: allInfo.os.version
+      },
+      hardware: {
+        logicalCores: allInfo.hardware.logicalCores,
+        deviceMemory: allInfo.hardware.deviceMemory
+      },
+      webgl: {
+        version: allInfo.webgl.version,
+        renderer: allInfo.webgl.renderer,
+        vendor: allInfo.webgl.vendor,
+        shadingLanguage: allInfo.webgl.shadingLanguage,
+        gpuType: {
+          type: allInfo.webgl.gpuType.type,
+          discrete: allInfo.webgl.gpuType.discrete,
+        },
+        performance: {
+          tier: allInfo.webgl.performance.tier,
+        },
+        extensions: {
+          length: allInfo.webgl.extensions.length,
+        }
+      }
+    }
+    let guid = await systemInfo.generateGuid(obj)
+    config.headers['BrowserFingerprint'] = guid
    if (config.ENCRYPT) {
      try {
        config = await encryptConfig(config)
--- a/src/utils/splitScreen.js
+++ b/src/utils/splitScreen.js
@ -0,0 +1,88 @@
+async function queryWindowManagement() {
+    return await navigator.permissions.query({ name: 'window-management' });;
+}
+async function getPermission() {
+    const permission = await queryWindowManagement();
+    console.log(permission.state, 'permission.state')
+    if (permission.state === "granted") { // 已经授权
+        return true
+    } else if (permission.state === "prompt") { // 询问是否授权
+        // 请求授权
+        if (navigator.permissions.request) {
+            navigator.permissions.request({ name: 'window-management' })
+        }
+        return false
+    } else if (permission.state === "denied") {
+        // 权限被拒绝
+        return false
+    }
+}
+function getScreen() {
+    return new Promise((resolve, reject) => {
+        let multiScreen = []
+        if (window.getScreenDetails) {
+            let getScreensProsime1 = window.getScreenDetails();
+            getScreensProsime1.then((c) => {
+                if (c instanceof Array) {
+                    multiScreen = c
+                } else if (c instanceof Object) {
+                    multiScreen = c.screens
+                } else {
+                    multiScreen = []
+                }
+                resolve(multiScreen)
+            }).catch((err) => {
+                reject(err)
+            });
+        } else if (window.getScreens) {
+            let getScreensProsime = window.getScreens();
+            getScreensProsime.then((c) => {
+                if (c instanceof Array) {
+                    multiScreen = c
+                } else if (c instanceof Object) {
+                    multiScreen = c.screens
+                } else {
+                    multiScreen = []
+                }
+                resolve(multiScreen)
+            }).catch((err) => {
+                reject(err)
+            })
+        }
+    })
+
+}
+export async function openWindow(url, name, Skip = false) {
+    // 判断浏览器是否兼容
+    // 高版本的谷歌，edge不支持跨屏，需要降低浏览器版本86.0版
+    if (!window.getScreens && !window.getScreenDetails) {
+        console.log('你的浏览器版本不支持多屏展示功能！');
+        return window.open(url, name);
+    }
+    let permission = await getPermission()
+    if (!permission) {
+        // alert('使用多屏功能请先进行授权')
+        if (Skip) {
+            return window.open(url, name);
+        }
+        return false
+    }
+    let multiScreen = await getScreen()
+    console.log(multiScreen, 'multiScreen')
+    // 判断是否2个屏幕
+    if (multiScreen.length < 2) {
+        console.log('请接入多个显示屏！');
+        return window.open(url, name);
+    }
+    console.log(screen, 'screen')
+    // 获取当前屏幕availLeft信息和所有信息比对，取另一个屏幕数据
+    let currentAvailLeft = screen.availLeft ? screen.availLeft : '0'
+    let newCurr = multiScreen.find((t) => t.availLeft != currentAvailLeft)
+    console.log(newCurr, 'newCurr')
+    let fulls = ''
+    for (let key in newCurr) {
+        fulls += `${key}=${(newCurr[key] || newCurr[key] === 0) ? newCurr[key] : 0},`
+    }
+    console.log(fulls, 'fulls')
+    return window.open(url, name, fulls);
+}
--- a/src/utils/stream.js
+++ b/src/utils/stream.js
@ -1,5 +1,5 @@
 import streamSaver from "streamsaver";
-import "streamsaver/examples/zip-stream.js";
+import "./zip-stream.js";
 import store from '@/store'
 import dcmjs from './dcmUpload/dcmjs'
 streamSaver.mitm = `${window.location.origin}/mitm.html?version=2.0.0`
@ -112,7 +112,7 @@ function downloadFileToUrl(url) {
        xhr.onload = function () {
            const arraybuffer = xhr.response;
            let dataset = dcmjs.data.DicomMessage.readFile(arraybuffer)
-            let newDicomFile = dataset.write({ fragmentMultiframe: false }) // fragmentMultiframe 原始数据是否进行分割
+            let newDicomFile = dataset.write({ fragmentMultiframe: false, startOffset: false }) // fragmentMultiframe 原始数据是否进行分割
            const bufferArray = new Uint8Array(newDicomFile)
            const blob = new Blob([bufferArray], { type: 'application/octet-stream' })
            const href = URL.createObjectURL(blob)
--- a/src/utils/systemInfo.js
+++ b/src/utils/systemInfo.js
@ -0,0 +1,686 @@
+// 浏览器信息检测
+class SystemInfo {
+    constructor() {
+        this.info = {
+            browser: this.getBrowserInfo(),
+            os: this.getOSInfo(),
+            hardware: this.getHardwareInfo(),
+            webgl: this.getWebGLInfo()
+        };
+    }
+
+    // 获取浏览器信息
+    getBrowserInfo() {
+        const ua = navigator.userAgent;
+        let browser = {
+            name: 'Unknown',
+            version: 'Unknown',
+            fullVersion: navigator.appVersion
+        };
+
+        // 检测浏览器类型
+        if (ua.includes('Firefox')) {
+            browser.name = 'Firefox';
+            browser.version = this.extractVersion(ua, 'Firefox');
+        } else if (ua.includes('Chrome') && !ua.includes('Edg') && !ua.includes('OPR')) {
+            browser.name = 'Chrome';
+            browser.version = this.extractVersion(ua, 'Chrome');
+        } else if (ua.includes('Safari') && !ua.includes('Chrome')) {
+            browser.name = 'Safari';
+            browser.version = this.extractVersion(ua, 'Version');
+        } else if (ua.includes('Edg')) {
+            browser.name = 'Edge';
+            browser.version = this.extractVersion(ua, 'Edg');
+        } else if (ua.includes('OPR') || ua.includes('Opera')) {
+            browser.name = 'Opera';
+            browser.version = this.extractVersion(ua, 'OPR') || this.extractVersion(ua, 'Opera');
+        } else if (ua.includes('Trident') || ua.includes('MSIE')) {
+            browser.name = 'Internet Explorer';
+            browser.version = this.extractVersion(ua, 'MSIE') || this.extractVersion(ua, 'rv:');
+        }
+
+        return browser;
+    }
+
+    // 提取版本号
+    extractVersion(userAgent, browserName) {
+        const match = userAgent.match(new RegExp(`${browserName}/([0-9]+(\\.[0-9]+)?)`));
+        return match ? match[1] : 'Unknown';
+    }
+
+    // 获取操作系统信息
+    getOSInfo() {
+        const ua = navigator.userAgent;
+        let os = {
+            name: 'Unknown',
+            version: 'Unknown',
+            architecture: this.getArchitecture()
+        };
+
+        if (ua.includes('Windows')) {
+            os.name = 'Windows';
+            if (ua.includes('Windows NT 10.0')) os.version = '10';
+            else if (ua.includes('Windows NT 6.3')) os.version = '8.1';
+            else if (ua.includes('Windows NT 6.2')) os.version = '8';
+            else if (ua.includes('Windows NT 6.1')) os.version = '7';
+            else if (ua.includes('Windows NT 6.0')) os.version = 'Vista';
+            else if (ua.includes('Windows NT 5.1')) os.version = 'XP';
+        } else if (ua.includes('Mac OS X')) {
+            os.name = 'macOS';
+            const match = ua.match(/Mac OS X (\d+[._]\d+)/);
+            if (match) os.version = match[1].replace('_', '.');
+        } else if (ua.includes('Linux')) {
+            os.name = 'Linux';
+        } else if (ua.includes('Android')) {
+            os.name = 'Android';
+            const match = ua.match(/Android ([0-9.]+)/);
+            if (match) os.version = match[1];
+        } else if (ua.includes('like Mac')) {
+            os.name = 'iOS';
+            const match = ua.match(/OS (\d+[_]\d+)/);
+            if (match) os.version = match[1].replace('_', '.');
+        }
+
+        return os;
+    }
+
+    // 获取系统架构
+    getArchitecture() {
+        if (navigator.userAgent.includes('x64') || navigator.userAgent.includes('x86_64')) {
+            return '64-bit';
+        } else if (navigator.userAgent.includes('x86') || navigator.userAgent.includes('i686')) {
+            return '32-bit';
+        } else if (navigator.userAgent.includes('ARM')) {
+            return 'ARM';
+        } else if (navigator.userAgent.includes('Win64')) {
+            return '64-bit';
+        }
+        return 'Unknown';
+    }
+
+    // 获取硬件信息
+    getHardwareInfo() {
+        return {
+            logicalCores: navigator.hardwareConcurrency || 'Unknown',
+            deviceMemory: navigator.deviceMemory ? `${navigator.deviceMemory} GB` : 'Unknown',
+            maxTouchPoints: navigator.maxTouchPoints || 0
+        };
+    }
+
+    // 获取WebGL和显卡信息
+    getWebGLInfo() {
+        const webglInfo = {
+            webgl1: this.getWebGLContextInfo('webgl'),
+            webgl2: this.getWebGLContextInfo('webgl2'),
+            supported: false,
+            renderer: 'Unknown',
+            vendor: 'Unknown',
+            version: 'Unknown',
+            shadingLanguage: 'Unknown',
+            extensions: []
+        };
+
+        const canvas = document.createElement('canvas');
+        let gl = null;
+
+        // 尝试获取WebGL2上下文
+        try {
+            gl = canvas.getContext('webgl2') || canvas.getContext('experimental-webgl2');
+        } catch (e) {
+            console.log('WebGL2 not supported:', e.message);
+        }
+
+        // 如果WebGL2不可用，尝试WebGL1
+        if (!gl) {
+            try {
+                gl = canvas.getContext('webgl') || canvas.getContext('experimental-webgl');
+            } catch (e) {
+                console.log('WebGL not supported:', e.message);
+            }
+        }
+
+        if (gl) {
+            webglInfo.supported = true;
+
+            // 获取显卡信息
+            const debugInfo = gl.getExtension('WEBGL_debug_renderer_info');
+            if (debugInfo) {
+                webglInfo.renderer = gl.getParameter(debugInfo.UNMASKED_RENDERER_WEBGL) || 'Unknown';
+                webglInfo.vendor = gl.getParameter(debugInfo.UNMASKED_VENDOR_WEBGL) || 'Unknown';
+            }
+
+            // 获取WebGL版本信息
+            webglInfo.version = gl.getParameter(gl.VERSION) || 'Unknown';
+            webglInfo.shadingLanguage = gl.getParameter(gl.SHADING_LANGUAGE_VERSION) || 'Unknown';
+
+            // 获取支持的扩展
+            try {
+                webglInfo.extensions = gl.getSupportedExtensions() || [];
+            } catch (e) {
+                console.log('无法获取WebGL扩展:', e.message);
+            }
+
+            // 检查GPU性能级别
+            webglInfo.performance = this.getGPUPerformanceInfo(gl);
+
+            // 检查内存信息（如果支持）
+            webglInfo.memoryInfo = this.getGPUMemoryInfo(gl);
+
+            // 检查是否使用集成显卡
+            if (webglInfo.renderer) {
+                webglInfo.gpuType = this.detectGPUType(webglInfo.renderer);
+            }
+        }
+
+        return webglInfo;
+    }
+
+    // 获取WebGL上下文的具体信息
+    getWebGLContextInfo(contextType) {
+        const canvas = document.createElement('canvas');
+        let gl = null;
+
+        try {
+            gl = canvas.getContext(contextType) ||
+                canvas.getContext(`experimental-${contextType}`);
+        } catch (e) {
+            return { supported: false, error: e.message };
+        }
+
+        if (!gl) {
+            return { supported: false };
+        }
+
+        return {
+            supported: true,
+            context: gl
+        };
+    }
+
+    // 获取GPU性能信息
+    getGPUPerformanceInfo(gl) {
+        const info = { tier: 'unknown', features: [] };
+
+        // 检查是否支持高性能特性
+        try {
+            // 检查帧缓冲
+            if (gl.checkFramebufferStatus) {
+                info.features.push('framebuffer');
+            }
+
+            // 检查浮点纹理
+            const floatExt = gl.getExtension('OES_texture_float') ||
+                gl.getExtension('EXT_color_buffer_float');
+            if (floatExt) info.features.push('float_textures');
+
+            // 检查多重采样
+            const msaaExt = gl.getExtension('WEBGL_multisampled_render_to_texture');
+            if (msaaExt) info.features.push('msaa');
+
+            // 检查实例化渲染
+            const instancingExt = gl.getExtension('ANGLE_instanced_arrays') ||
+                gl.getExtension('WEBGL_draw_buffers');
+            if (instancingExt) info.features.push('instancing');
+
+            // 尝试检测性能级别（基于支持的扩展）
+            if (info.features.includes('float_textures') &&
+                info.features.includes('msaa') &&
+                info.features.includes('instancing')) {
+                info.tier = 'high';
+            } else if (info.features.length >= 2) {
+                info.tier = 'medium';
+            } else {
+                info.tier = 'low';
+            }
+        } catch (e) {
+            console.log('获取GPU性能信息失败:', e);
+        }
+
+        return info;
+    }
+
+    // 获取GPU内存信息
+    getGPUMemoryInfo(gl) {
+        const memoryInfo = { estimatedMemory: 'Unknown' };
+
+        // 尝试通过扩展获取内存信息
+        try {
+            // 检查是否支持内存信息扩展
+            const memoryExt = gl.getExtension('WEBGL_debug_renderer_info');
+            if (memoryExt) {
+                // 一些浏览器会通过UNMASKED_RENDERER_WEBGL暴露内存信息
+                const renderer = gl.getParameter(memoryExt.UNMASKED_RENDERER_WEBGL);
+                if (renderer) {
+                    // 尝试从渲染器字符串中提取内存信息
+                    const match = renderer.match(/(\d+)\s*MB|(\d+)\s*GB|VRAM\s*:\s*(\d+)/i);
+                    if (match) {
+                        memoryInfo.estimatedMemory = match[0];
+                    }
+                }
+            }
+
+            // 通过创建大纹理测试内存
+            memoryInfo.maxTextureSize = gl.getParameter(gl.MAX_TEXTURE_SIZE);
+            memoryInfo.maxRenderbufferSize = gl.getParameter(gl.MAX_RENDERBUFFER_SIZE);
+        } catch (e) {
+            // 静默失败
+        }
+
+        return memoryInfo;
+    }
+
+    // 检测GPU类型
+    detectGPUType(renderer) {
+        const r = renderer.toLowerCase();
+
+        if (r.includes('nvidia') || r.includes('geforce') || r.includes('gtx') || r.includes('rtx')) {
+            return { type: 'NVIDIA', discrete: true };
+        } else if (r.includes('amd') || r.includes('radeon') || r.includes('rx')) {
+            return { type: 'AMD', discrete: true };
+        } else if (r.includes('intel') || r.includes('hd graphics') || r.includes('iris') || r.includes('uhd')) {
+            return { type: 'Intel', discrete: false };
+        } else if (r.includes('apple') || r.includes('apple gpu') || r.includes('apple m')) {
+            return { type: 'Apple Silicon', discrete: false };
+        } else if (r.includes('mali') || r.includes('adreno') || r.includes('powervr')) {
+            return { type: 'Mobile GPU', discrete: false };
+        } else if (r.includes('microsoft') || r.includes('basic')) {
+            return { type: 'Software Renderer', discrete: false };
+        }
+
+        return { type: 'Unknown', discrete: false };
+    }
+
+    // 获取屏幕信息
+    getScreenInfo() {
+        return {
+            width: window.screen.width,
+            height: window.screen.height,
+            colorDepth: window.screen.colorDepth,
+            pixelDepth: window.screen.pixelDepth,
+            devicePixelRatio: window.devicePixelRatio || 1,
+            orientation: window.screen.orientation ? window.screen.orientation.type : 'unknown'
+        };
+    }
+
+    // 获取所有系统信息
+    getAllInfo() {
+        return {
+            ...this.info,
+            screen: this.getScreenInfo(),
+            userAgent: navigator.userAgent,
+            platform: navigator.platform,
+            language: navigator.language,
+            languages: navigator.languages,
+            cookiesEnabled: navigator.cookieEnabled,
+            online: navigator.onLine,
+            javaEnabled: navigator.javaEnabled ? navigator.javaEnabled() : false,
+            pdfViewerEnabled: navigator.pdfViewerEnabled || false,
+            doNotTrack: navigator.doNotTrack || 'unknown',
+            timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
+            dateTimeFormat: new Date().toString()
+        };
+    }
+
+    // 格式化输出
+    formatAsText() {
+        const info = this.getAllInfo();
+        let output = '========== 系统信息 ==========\n\n';
+
+        // 浏览器信息
+        output += '=== 浏览器信息 ===\n';
+        output += `浏览器: ${info.browser.name} ${info.browser.version}\n`;
+        output += `完整版本: ${info.browser.fullVersion}\n`;
+        output += `用户代理: ${info.userAgent}\n\n`;
+
+        // 操作系统信息
+        output += '=== 操作系统信息 ===\n';
+        output += `系统: ${info.os.name} ${info.os.version}\n`;
+        output += `架构: ${info.os.architecture}\n`;
+        output += `平台: ${info.platform}\n\n`;
+
+        // 硬件信息
+        output += '=== 硬件信息 ===\n';
+        output += `逻辑核心数: ${info.hardware.logicalCores}\n`;
+        output += `设备内存: ${info.hardware.deviceMemory}\n`;
+        output += `最大触摸点数: ${info.hardware.maxTouchPoints}\n\n`;
+
+        // 屏幕信息
+        output += '=== 屏幕信息 ===\n';
+        output += `分辨率: ${info.screen.width} × ${info.screen.height}\n`;
+        output += `设备像素比: ${info.screen.devicePixelRatio}\n`;
+        output += `颜色深度: ${info.screen.colorDepth} 位\n`;
+        output += `像素深度: ${info.screen.pixelDepth} 位\n`;
+        output += `方向: ${info.screen.orientation}\n\n`;
+
+        // WebGL信息
+        output += '=== WebGL 信息 ===\n';
+        output += `WebGL 支持: ${info.webgl.supported ? '是' : '否'}\n`;
+
+        if (info.webgl.supported) {
+            output += `WebGL 版本: ${info.webgl.version}\n`;
+            output += `显卡型号: ${info.webgl.renderer}\n`;
+            output += `显卡厂商: ${info.webgl.vendor}\n`;
+            output += `着色语言: ${info.webgl.shadingLanguage}\n`;
+
+            if (info.webgl.gpuType) {
+                output += `GPU 类型: ${info.webgl.gpuType.type}\n`;
+                output += `独立显卡: ${info.webgl.gpuType.discrete ? '是' : '否'}\n`;
+            }
+
+            output += `性能等级: ${info.webgl.performance.tier}\n`;
+            output += `支持特性: ${info.webgl.performance.features.join(', ')}\n`;
+
+            if (info.webgl.memoryInfo.estimatedMemory !== 'Unknown') {
+                output += `显存估计: ${info.webgl.memoryInfo.estimatedMemory}\n`;
+            }
+
+            if (info.webgl.memoryInfo.maxTextureSize) {
+                output += `最大纹理尺寸: ${info.webgl.memoryInfo.maxTextureSize}\n`;
+            }
+
+            output += `WebGL 扩展数: ${info.webgl.extensions.length}\n`;
+        }
+
+        // 其他信息
+        output += '\n=== 其他信息 ===\n';
+        output += `语言: ${info.language}\n`;
+        output += `支持语言: ${info.languages.join(', ')}\n`;
+        output += `时区: ${info.timezone}\n`;
+        output += `Cookie 支持: ${info.cookiesEnabled ? '是' : '否'}\n`;
+        output += `在线状态: ${info.online ? '在线' : '离线'}\n`;
+        output += `Java 支持: ${info.javaEnabled ? '是' : '否'}\n`;
+        output += `PDF 查看器: ${info.pdfViewerEnabled ? '支持' : '不支持'}\n`;
+        output += `Do Not Track: ${info.doNotTrack}\n`;
+        output += `当前时间: ${info.dateTimeFormat}\n`;
+
+        return output;
+    }
+
+    // 创建HTML显示
+    createInfoHTML() {
+        const info = this.getAllInfo();
+        let html = `
+      <div class="system-info">
+        <h2>系统信息</h2>
+        
+        <div class="info-section">
+          <h3>🌐 浏览器信息</h3>
+          <table>
+            <tr><td>浏览器</td><td>${info.browser.name} ${info.browser.version}</td></tr>
+            <tr><td>用户代理</td><td><code>${info.userAgent}</code></td></tr>
+            <tr><td>平台</td><td>${info.platform}</td></tr>
+          </table>
+        </div>
+        
+        <div class="info-section">
+          <h3>💻 操作系统</h3>
+          <table>
+            <tr><td>系统</td><td>${info.os.name} ${info.os.version}</td></tr>
+            <tr><td>架构</td><td>${info.os.architecture}</td></tr>
+            <tr><td>语言</td><td>${info.language}</td></tr>
+            <tr><td>时区</td><td>${info.timezone}</td></tr>
+          </table>
+        </div>
+        
+        <div class="info-section">
+          <h3>🖥️ 硬件信息</h3>
+          <table>
+            <tr><td>CPU 核心数</td><td>${info.hardware.logicalCores}</td></tr>
+            <tr><td>设备内存</td><td>${info.hardware.deviceMemory}</td></tr>
+            <tr><td>屏幕分辨率</td><td>${info.screen.width} × ${info.screen.height}</td></tr>
+            <tr><td>设备像素比</td><td>${info.screen.devicePixelRatio}</td></tr>
+          </table>
+        </div>
+    `;
+
+        if (info.webgl.supported) {
+            html += `
+        <div class="info-section">
+          <h3>🎮 WebGL & 显卡信息</h3>
+          <table>
+            <tr><td>WebGL 支持</td><td>✅ 已支持</td></tr>
+            <tr><td>WebGL 版本</td><td>${info.webgl.version}</td></tr>
+            <tr><td>显卡型号</td><td><strong>${info.webgl.renderer}</strong></td></tr>
+            <tr><td>显卡厂商</td><td>${info.webgl.vendor}</td></tr>
+            <tr><td>GPU 类型</td><td>${info.webgl.gpuType.type} ${info.webgl.gpuType.discrete ? '（独立显卡）' : '（集成显卡）'}</td></tr>
+            <tr><td>着色语言</td><td>${info.webgl.shadingLanguage}</td></tr>
+            <tr><td>性能等级</td><td><span class="perf-${info.webgl.performance.tier}">${info.webgl.performance.tier}</span></td></tr>
+            <tr><td>WebGL 扩展数</td><td>${info.webgl.extensions.length} 个</td></tr>
+      `;
+
+            if (info.webgl.memoryInfo.estimatedMemory !== 'Unknown') {
+                html += `<tr><td>显存估计</td><td>${info.webgl.memoryInfo.estimatedMemory}</td></tr>`;
+            }
+
+            html += `</table></div>`;
+        } else {
+            html += `
+        <div class="info-section">
+          <h3>🎮 WebGL & 显卡信息</h3>
+          <p style="color: red;">❌ WebGL 不支持</p>
+        </div>
+      `;
+        }
+
+        html += `</div>`;
+
+        return html;
+    }
+    deepSortObject(obj) {
+        if (obj === null || typeof obj !== 'object') {
+            return obj;
+        }
+
+        if (Array.isArray(obj)) {
+            return obj.map(deepSortObject);
+        }
+
+        const sorted = {};
+        Object.keys(obj).sort().forEach(key => {
+            sorted[key] = this.deepSortObject(obj[key]);
+        });
+
+        return sorted;
+    }
+
+    getCanonicalString(obj) {
+        if (typeof obj !== 'object' || obj === null) {
+            return JSON.stringify(obj);
+        }
+
+        const sorted = this.deepSortObject(obj);
+        return JSON.stringify(sorted);
+    }
+
+    // 简单哈希函数
+    simpleHash(str) {
+        let hash = 0;
+        for (let i = 0; i < str.length; i++) {
+            const char = str.charCodeAt(i);
+            hash = ((hash << 5) - hash) + char;
+            hash = hash & hash;
+        }
+        return hash;
+    }
+
+    // 简单SHA-256模拟
+    simpleSHA256(str) {
+        let hash = 0;
+        for (let i = 0; i < str.length; i++) {
+            const char = str.charCodeAt(i);
+            hash = ((hash << 5) - hash) + char;
+            hash = hash & hash;
+        }
+
+        const hashArray = [];
+        for (let i = 0; i < 8; i++) {
+            hashArray[i] = (hash + i * 2654435761) >>> 0;
+        }
+
+        return hashArray;
+    }
+
+    // 格式化哈希为GUID
+    formatHashAsGuid(hashArray) {
+        const hexParts = hashArray.map(h => h.toString(16).padStart(8, '0'));
+        return `${hexParts[0]}${hexParts[1].substring(0, 4)}-${hexParts[1].substring(4)}-${hexParts[2].substring(0, 4)}-${hexParts[3].substring(0, 4)}-${hexParts[3].substring(4)}${hexParts[4]}${hexParts[5]}`;
+    }
+
+    // 1. 确定性哈希算法
+    objectToGuidDeterministic(obj) {
+        const canonicalString = this.getCanonicalString(obj);
+        const hash = this.simpleSHA256(canonicalString);
+        return this.formatHashAsGuid(hash).toUpperCase();
+    }
+
+    // 2. 伪随机算法
+    getSeedFromObject(obj) {
+        const str = JSON.stringify(obj);
+        return this.simpleHash(str);
+    }
+
+    createSeededRandom(seed) {
+        let state = seed;
+        return function () {
+            state = (state * 1664525 + 1013904223) >>> 0;
+            return (state & 0x3FFFFFFF) / 0x3FFFFFFF;
+        };
+    }
+
+    generateVersion4Guid(randomFn) {
+        let guid = '';
+
+        for (let i = 0; i < 32; i++) {
+            if (i === 8 || i === 12 || i === 16 || i === 20) {
+                guid += '-';
+            }
+
+            if (i === 12) {
+                guid += '4';
+            } else if (i === 16) {
+                const variant = Math.floor(randomFn() * 4);
+                guid += (8 + variant).toString(16).toUpperCase();
+            } else {
+                const randomHex = Math.floor(randomFn() * 16).toString(16);
+                guid += randomHex;
+            }
+        }
+
+        return guid.toUpperCase();
+    }
+
+    objectToGuidPseudorandom(obj) {
+        const seed = this.getSeedFromObject(obj);
+        const prng = this.createSeededRandom(seed);
+        return this.generateVersion4Guid(prng);
+    }
+
+    // 3. Crypto API算法（同步版本）
+    objectToGuidCryptoSync(obj) {
+        try {
+            const str = this.getCanonicalString(obj);
+            let hash = 0;
+            for (let i = 0; i < str.length; i++) {
+                const char = str.charCodeAt(i);
+                hash = ((hash << 5) - hash) + char;
+                hash = hash & hash;
+            }
+
+            const bytes = new Array(16);
+            for (let i = 0; i < 16; i++) {
+                bytes[i] = (hash + i * 2654435761) & 0xFF;
+            }
+
+            bytes[6] = (bytes[6] & 0x0F) | 0x40;
+            bytes[8] = (bytes[8] & 0x3F) | 0x80;
+
+            return bytes.map(b => b.toString(16).padStart(2, '0'))
+                .join('')
+                .replace(/(.{8})(.{4})(.{4})(.{4})(.{12})/, '$1-$2-$3-$4-$5')
+                .toUpperCase();
+        } catch (error) {
+            return this.objectToGuidDeterministic(obj);
+        }
+    }
+
+    // 4. 组合算法
+    combineComponents(deterministicHash, namespaceHash, timestamp, randomComponent) {
+        const hashDigits = deterministicHash.replace(/-/g, '');
+        const bytes = new Array(16);
+
+        for (let i = 0; i < 16; i++) {
+            const hashByte = parseInt(hashDigits.substr(i * 2, 2), 16) || 0;
+            const nsByte = (namespaceHash >> (i * 2)) & 0xFF;
+            const timeByte = (timestamp >> (i * 2)) & 0xFF;
+            const randomByte = parseInt(randomComponent.substr(i % 8, 1), 16) || 0;
+
+            bytes[i] = (hashByte ^ nsByte ^ timeByte ^ randomByte) & 0xFF;
+        }
+
+        bytes[6] = (bytes[6] & 0x0F) | 0x40;
+        bytes[8] = (bytes[8] & 0x3F) | 0x80;
+
+        return bytes.map(b => b.toString(16).padStart(2, '0'))
+            .join('')
+            .replace(/(.{8})(.{4})(.{4})(.{4})(.{12})/, '$1-$2-$3-$4-$5')
+            .toUpperCase();
+    }
+
+    objectToGuidCombined(obj, namespace = '') {
+        const deterministicHash = this.objectToGuidDeterministic(obj);
+        const namespaceHash = namespace ? this.simpleHash(namespace) : 0;
+        const timestamp = Date.now();
+        const randomComponent = Math.random().toString(16).substr(2, 8);
+
+        return this.combineComponents(deterministicHash, namespaceHash, timestamp, randomComponent);
+    }
+
+    // 主生成函数
+    async generateGuid(inputText, inputType, algorithmType = 'deterministic') {
+        let obj;
+        try {
+            if (inputType === 'json') {
+                obj = JSON.parse(inputText);
+            } else {
+                obj = inputText
+            }
+        } catch (error) {
+            return error;
+        }
+
+        let guid;
+        let algorithmName;
+        try {
+            switch (algorithmType) {
+                case 'deterministic':
+                    guid = this.objectToGuidDeterministic(obj);
+                    algorithmName = '确定性哈希算法';
+                    break;
+                case 'pseudorandom':
+                    guid = this.objectToGuidPseudorandom(obj);
+                    algorithmName = '伪随机算法';
+                    break;
+                case 'crypto':
+                    guid = this.objectToGuidCryptoSync(obj);
+                    algorithmName = 'Crypto API算法';
+                    break;
+                case 'combined':
+                    guid = this.objectToGuidCombined(obj, 'example-namespace');
+                    algorithmName = '组合算法';
+                    break;
+                default:
+                    guid = '未知算法';
+                    algorithmName = '未知';
+            }
+            return guid;
+        } catch (error) {
+            return error
+        }
+    }
+}
+
+if (typeof module !== 'undefined' && module.exports) {
+    module.exports = SystemInfo;
+} else if (typeof window !== 'undefined') {
+    window.SystemInfo = SystemInfo;
+}
--- a/src/utils/zip-stream.js
+++ b/src/utils/zip-stream.js
@ -0,0 +1,382 @@
+class Crc32 {
+  constructor() {
+    this.crc = -1
+  }
+
+  append(data) {
+    var crc = this.crc | 0; var table = this.table
+    for (var offset = 0, len = data.length | 0; offset < len; offset++) {
+      crc = (crc >>> 8) ^ table[(crc ^ data[offset]) & 0xFF]
+    }
+    this.crc = crc
+  }
+
+  get() {
+    return ~this.crc
+  }
+}
+Crc32.prototype.table = (() => {
+  var i; var j; var t; var table = []
+  for (i = 0; i < 256; i++) {
+    t = i
+    for (j = 0; j < 8; j++) {
+      t = (t & 1)
+        ? (t >>> 1) ^ 0xEDB88320
+        : t >>> 1
+    }
+    table[i] = t
+  }
+  return table
+})()
+
+const getDataHelper = byteLength => {
+  var uint8 = new Uint8Array(byteLength)
+  return {
+    array: uint8,
+    view: new DataView(uint8.buffer)
+  }
+}
+
+const ZIP_SIGNATURE_LOCAL = 0x04034b50
+const ZIP_SIGNATURE_CENTRAL = 0x02014b50
+const ZIP_SIGNATURE_EOCD = 0x06054b50
+const ZIP_SIGNATURE_ZIP64_EOCD = 0x06064b50
+const ZIP_SIGNATURE_ZIP64_LOCATOR = 0x07064b50
+
+const ZIP64_MAGIC = 0xFFFFFFFF
+
+function u16(view, offset, value) { view.setUint16(offset, value, true) }
+function u32(view, offset, value) { view.setUint32(offset, value >>> 0, true) }
+
+function concatUint8(chunks, total) {
+  const out = new Uint8Array(total)
+  let off = 0
+  for (const c of chunks) {
+    out.set(c, off)
+    off += c.length
+  }
+  return out
+}
+
+function createWriter(underlyingSource) {
+  const files = Object.create(null)
+  const filenames = []
+  const encoder = new TextEncoder() // 保持UTF-8编码
+
+  let offset = 0 // bytes written to output so far
+  let activeZipIndex = 0
+  let ctrl
+  let activeZipObject
+  let closed = false
+
+  function processNextChunk() {
+    if (!activeZipObject) return
+
+    // directory entry: just local header + immediate footer
+    if (activeZipObject.directory) {
+      if (!activeZipObject.headerWritten) {
+        activeZipObject.writeLocalHeader()
+        activeZipObject.headerWritten = true
+      }
+      if (!activeZipObject.footerWritten) {
+        activeZipObject.writeDataDescriptor() // will be zeros
+        activeZipObject.footerWritten = true
+        next()
+      }
+      return
+    }
+
+    if (!activeZipObject.reader) {
+      if (!activeZipObject.fileLike || !activeZipObject.fileLike.stream) {
+        next()
+        return
+      }
+      activeZipObject.crc = new Crc32()
+      activeZipObject.reader = activeZipObject.fileLike.stream().getReader()
+      activeZipObject.writeLocalHeader()
+      activeZipObject.headerWritten = true
+      return
+    }
+
+    return activeZipObject.reader.read().then(({ done, value }) => {
+      if (done) {
+        activeZipObject.writeDataDescriptor()
+        activeZipObject.footerWritten = true
+        next()
+        return
+      }
+      const chunk = value instanceof Uint8Array ? value : new Uint8Array(value)
+      activeZipObject.crc.append(chunk)
+      activeZipObject.uncompressedLength += chunk.length
+      activeZipObject.compressedLength += chunk.length
+      ctrl.enqueue(chunk)
+      offset += chunk.length
+    })
+  }
+
+  function next() {
+    activeZipIndex++
+    activeZipObject = files[filenames[activeZipIndex]]
+    if (activeZipObject) {
+      processNextChunk()
+    } else if (closed) {
+      closeZip()
+    }
+  }
+
+  function dosDateTime(date) {
+    const dt = new Date(date)
+    const time = ((dt.getHours() << 11) | (dt.getMinutes() << 5) | (dt.getSeconds() / 2)) & 0xFFFF
+    const d = (((dt.getFullYear() - 1980) << 9) | ((dt.getMonth() + 1) << 5) | dt.getDate()) & 0xFFFF
+    return { time, date: d }
+  }
+
+  const zipWriter = {
+    enqueue(fileLike) {
+      if (closed) throw new TypeError('Cannot enqueue after close()')
+
+      let name = String(fileLike.name || '').trim()
+      if (!name) throw new Error('Missing file name')
+
+      if (fileLike.directory && !name.endsWith('/')) name += '/'
+      if (files[name]) throw new Error('File already exists.')
+
+      const nameBuf = encoder.encode(name) // 保持UTF-8编码
+      const commentBuf = encoder.encode(fileLike.comment || '')
+      const { time, date } = dosDateTime(typeof fileLike.lastModified === 'undefined' ? Date.now() : fileLike.lastModified)
+
+      const zipObject = (files[name] = {
+        fileLike,
+        directory: !!fileLike.directory,
+        nameBuf,
+        comment: commentBuf,
+        time,
+        date,
+
+        // tracked
+        offset: 0,
+        crc: null,
+        compressedLength: 0,
+        uncompressedLength: 0,
+        headerWritten: false,
+        footerWritten: false,
+        reader: null,
+
+        // whether sizes/offset require ZIP64
+        needsZip64() {
+          return (
+            this.uncompressedLength > ZIP64_MAGIC ||
+            this.compressedLength > ZIP64_MAGIC ||
+            this.offset > ZIP64_MAGIC
+          )
+        },
+
+        writeLocalHeader() {
+          this.offset = offset
+
+          // 关键修改：设置通用位标记，第11位（0x0800）表示文件名使用UTF-8编码
+          // 保留原0x0008（数据描述符存在），新增0x0800（UTF-8编码）
+          const generalPurposeBitFlag = 0x0808 
+          const compressionMethod = 0 // store
+          const versionNeeded = this.needsZip64() ? 45 : 20 // 适配ZIP64
+
+          // We always use data descriptor; write zeros for crc/sizes in local header
+          const local = getDataHelper(30 + this.nameBuf.length)
+          u32(local.view, 0, ZIP_SIGNATURE_LOCAL)
+          u16(local.view, 4, versionNeeded)
+          u16(local.view, 6, generalPurposeBitFlag) // 应用UTF-8标记
+          u16(local.view, 8, compressionMethod)
+          u16(local.view, 10, this.time)
+          u16(local.view, 12, this.date)
+          u32(local.view, 14, 0)
+          u32(local.view, 18, 0)
+          u32(local.view, 22, 0)
+          u16(local.view, 26, this.nameBuf.length)
+          u16(local.view, 28, 0) // extra length
+          local.array.set(this.nameBuf, 30)
+
+          ctrl.enqueue(local.array)
+          offset += local.array.length
+        },
+
+        writeDataDescriptor() {
+          // data descriptor: optional signature + crc32 + sizes (32-bit or 64-bit)
+          const crc = this.crc ? this.crc.get() >>> 0 : 0
+          const useZip64 = this.needsZip64()
+
+          if (!useZip64) {
+            const dd = getDataHelper(16)
+            u32(dd.view, 0, 0x08074b50)
+            u32(dd.view, 4, crc)
+            u32(dd.view, 8, this.compressedLength)
+            u32(dd.view, 12, this.uncompressedLength)
+            ctrl.enqueue(dd.array)
+            offset += dd.array.length
+          } else {
+            // 24 bytes: sig + crc32 + compSize(8) + uncompSize(8)
+            const dd = getDataHelper(24)
+            u32(dd.view, 0, 0x08074b50)
+            u32(dd.view, 4, crc)
+            // BigInt writes
+            dd.view.setBigUint64(8, BigInt(this.compressedLength), true)
+            dd.view.setBigUint64(16, BigInt(this.uncompressedLength), true)
+            ctrl.enqueue(dd.array)
+            offset += dd.array.length
+          }
+        }
+      })
+
+      filenames.push(name)
+
+      if (!activeZipObject) {
+        activeZipObject = zipObject
+        processNextChunk()
+      }
+    },
+
+    close() {
+      if (closed) throw new TypeError('Cannot close twice')
+      closed = true
+      if (!activeZipObject) closeZip()
+    }
+  }
+
+  function closeZip() {
+    // Build central directory in memory then enqueue once.
+    const cdChunks = []
+    let cdSize = 0
+
+    for (const name of filenames) {
+      const file = files[name]
+      const useZip64 = file.needsZip64()
+
+      const versionMadeBy = useZip64 ? 45 : 20
+      const versionNeeded = useZip64 ? 45 : 20
+      // 关键修改：中央目录也需要设置UTF-8标记
+      const generalPurposeBitFlag = 0x0808 
+      const compressionMethod = 0
+
+      const crc = file.crc ? file.crc.get() >>> 0 : 0
+      const compressed32 = useZip64 ? ZIP64_MAGIC : file.compressedLength
+      const uncompressed32 = useZip64 ? ZIP64_MAGIC : file.uncompressedLength
+      const offset32 = useZip64 ? ZIP64_MAGIC : file.offset
+
+      // ZIP64 extra field if needed
+      let extra = new Uint8Array(0)
+      if (useZip64) {
+        // headerId(2)=0x0001, dataSize(2)=24, uncompressed(8), compressed(8), offset(8)
+        extra = new Uint8Array(4 + 24)
+        const ev = new DataView(extra.buffer)
+        u16(ev, 0, 0x0001)
+        u16(ev, 2, 24)
+        ev.setBigUint64(4, BigInt(file.uncompressedLength), true)
+        ev.setBigUint64(12, BigInt(file.compressedLength), true)
+        ev.setBigUint64(20, BigInt(file.offset), true)
+      }
+
+      const headerLen = 46 + file.nameBuf.length + extra.length + file.comment.length
+      const cd = getDataHelper(headerLen)
+
+      u32(cd.view, 0, ZIP_SIGNATURE_CENTRAL)
+      u16(cd.view, 4, versionMadeBy)
+      u16(cd.view, 6, versionNeeded)
+      u16(cd.view, 8, generalPurposeBitFlag) // 中央目录应用UTF-8标记
+      u16(cd.view, 10, compressionMethod)
+      u16(cd.view, 12, file.time)
+      u16(cd.view, 14, file.date)
+      u32(cd.view, 16, crc)
+      u32(cd.view, 20, compressed32)
+      u32(cd.view, 24, uncompressed32)
+      u16(cd.view, 28, file.nameBuf.length)
+      u16(cd.view, 30, extra.length)
+      u16(cd.view, 32, file.comment.length)
+      u16(cd.view, 34, 0) // disk number start
+      u16(cd.view, 36, 0) // internal attrs
+
+      // external file attrs: mark directory
+      u32(cd.view, 38, file.directory ? 0x10 : 0)
+
+      u32(cd.view, 42, offset32)
+
+      cd.array.set(file.nameBuf, 46)
+      if (extra.length) cd.array.set(extra, 46 + file.nameBuf.length)
+      if (file.comment.length) cd.array.set(file.comment, 46 + file.nameBuf.length + extra.length)
+
+      cdChunks.push(cd.array)
+      cdSize += cd.array.length
+    }
+
+    const centralDirectoryOffset = offset
+    const centralDirectory = concatUint8(cdChunks, cdSize)
+    ctrl.enqueue(centralDirectory)
+    offset += centralDirectory.length
+
+    const entries = filenames.length
+
+    const needsZip64ForArchive =
+      entries > 0xFFFF ||
+      centralDirectoryOffset > ZIP64_MAGIC ||
+      cdSize > ZIP64_MAGIC ||
+      offset > ZIP64_MAGIC
+
+    const tailChunks = []
+    let tailSize = 0
+
+    if (needsZip64ForArchive) {
+      // ZIP64 EOCD
+      const zip64eocd = getDataHelper(56)
+      u32(zip64eocd.view, 0, ZIP_SIGNATURE_ZIP64_EOCD)
+      zip64eocd.view.setBigUint64(4, BigInt(44), true) // remaining size
+      u16(zip64eocd.view, 12, 45)
+      u16(zip64eocd.view, 14, 45)
+      u32(zip64eocd.view, 16, 0)
+      u32(zip64eocd.view, 20, 0)
+      zip64eocd.view.setBigUint64(24, BigInt(entries), true)
+      zip64eocd.view.setBigUint64(32, BigInt(entries), true)
+      zip64eocd.view.setBigUint64(40, BigInt(cdSize), true)
+      zip64eocd.view.setBigUint64(48, BigInt(centralDirectoryOffset), true)
+
+      // ZIP64 locator
+      const locator = getDataHelper(20)
+      u32(locator.view, 0, ZIP_SIGNATURE_ZIP64_LOCATOR)
+      u32(locator.view, 4, 0)
+      locator.view.setBigUint64(8, BigInt(centralDirectoryOffset + cdSize), true) // offset of zip64eocd
+      u32(locator.view, 16, 1)
+
+      tailChunks.push(zip64eocd.array, locator.array)
+      tailSize += zip64eocd.array.length + locator.array.length
+    }
+
+    // EOCD
+    const eocd = getDataHelper(22)
+    u32(eocd.view, 0, ZIP_SIGNATURE_EOCD)
+    u16(eocd.view, 4, 0)
+    u16(eocd.view, 6, 0)
+    u16(eocd.view, 8, Math.min(entries, 0xFFFF))
+    u16(eocd.view, 10, Math.min(entries, 0xFFFF))
+    u32(eocd.view, 12, needsZip64ForArchive ? ZIP64_MAGIC : cdSize)
+    u32(eocd.view, 16, needsZip64ForArchive ? ZIP64_MAGIC : centralDirectoryOffset)
+    u16(eocd.view, 20, 0) // comment length
+
+    tailChunks.push(eocd.array)
+    tailSize += eocd.array.length
+
+    ctrl.enqueue(concatUint8(tailChunks, tailSize))
+    ctrl.close()
+  }
+
+  return new ReadableStream({
+    start: c => {
+      ctrl = c
+      underlyingSource.start && Promise.resolve(underlyingSource.start(zipWriter))
+    },
+    pull() {
+      return processNextChunk() || (
+        underlyingSource.pull &&
+        Promise.resolve(underlyingSource.pull(zipWriter))
+      )
+    }
+  })
+}
+
+window.ZIP = createWriter
--- a/src/views/admin/user/components/Account.vue
+++ b/src/views/admin/user/components/Account.vue
@ -23,7 +23,11 @@ export default {

      })
        .then(() => {
-          resetPassword(this.userId).then(res => {
+          let data = {
+            BaseUrl: `${location.protocol}//${location.host}/login`,
+            IdentityUserId: this.userId
+          }
+          resetPassword(data).then(res => {
            if (res.IsSuccess) {
              this.$message({
                message: 'Reset password successfully',
--- a/src/views/dashboard/bigdata.vue
+++ b/src/views/dashboard/bigdata.vue
@ -112,7 +112,7 @@ export default {
      this.currentTime = moment().format('YYYY-MM-DD HH:mm:ss')
    },
    handleTitleClick() {
-      if (!screenfull.enabled) {
+      if (!screenfull.isEnabled) {
        this.$message({
          message: 'Your browser can not work',
          type: 'warning'
--- a/src/views/dicom-show/dicom-study.vue
+++ b/src/views/dicom-show/dicom-study.vue
@ -29,8 +29,12 @@
                          :src="item.previewImageUrl"
                          fit="fill"
                        /> -->
+                        <div class="imageBox" style="width: 72px;height:72px;">
                          <img class="image-preview" :src="item.previewImageUrl" crossorigin="anonymous" alt=""
-                          style="width: 72px;height:72px;" fit="fill">
+                            style="width: 72px;height:72px;" fit="fill" />
+                          <i class="el-icon-refresh" :title="$t('tip:refreshImage')"
+                            @click.stop="refreshImage(item)"></i>
+                        </div>
                        <div class="viewernavitextwrapper">
                          <div style="padding: 1px 5px 1px 1px;display: flex;justify-content: space-between;">
                            <div v-if="item.keySeries" style="color:red">
@ -83,8 +87,8 @@
                            {{ item.description }}
                          </div>
                          <div v-if="!item.keySeries" style="padding: 1px;">
-                            {{ item.imageloadedArr.length }}/{{ item.instanceCount }}
-                          </div>
+                            {{ item.imageloadedArr.length <= item.instanceCount ? item.imageloadedArr.length :
+                              item.instanceCount }}/{{ item.instanceCount }} </div>

                          </div>
                        </div>
@ -94,11 +98,14 @@
                          <div>
                            <span style="font-size: 12px;margin-right: 5px">{{ $t('trials:audit:table:isReading')
                            }}</span>
-                          <el-switch v-model="item.isReading" size="mini" @change="changeReadingStatus($event, item)" />
+                            <el-switch v-model="item.isReading" size="mini"
+                              @change="changeReadingStatus($event, item)" />
                          </div>
                          <div>
-                          <span style="font-size: 12px;margin-right: 5px">{{ $t('trials:audit:table:isDelete') }}</span>
-                          <el-switch v-model="item.isDeleted" size="mini" @change="changeDeleteStatus($event, item)" />
+                            <span style="font-size: 12px;margin-right: 5px">{{ $t('trials:audit:table:isDelete')
+                            }}</span>
+                            <el-switch v-model="item.isDeleted" size="mini"
+                              @change="changeDeleteStatus($event, item)" />
                          </div>
                        </div>
                        <div
@ -133,7 +140,7 @@ import * as cornerstone from 'cornerstone-core'
 import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'
 import dicomViewer from '@/components/Dicom/DicomViewer'
 import { getStudyInfo, getSeriesList } from '@/api/reading'
-import { getInstanceList, getPatientSeriesList, setSeriesStatus, setInstanceStatus } from '@/api/trials'
+import { getInstanceList, getPatientSeriesList, setSeriesStatus, setInstanceStatus, updateImageResizePath } from '@/api/trials'

 import requestPoolManager from '@/utils/request-pool'
 import store from '@/store'
@ -244,6 +251,62 @@ export default {
    workSpeedclose(true)
  },
  methods: {
+    async updateImageResizePath(data) {
+      try {
+        let res = await updateImageResizePath(data)
+        if (res.IsSuccess) {
+          this.$message.success(this.$t("message:tip:updateImageResizePath:success"))
+        }
+      } catch (err) {
+        console.log(err)
+      }
+    },
+    async refreshImage(item) {
+      let thumbnailPath = item.previewImageUrl.split(this.OSSclientConfig.basePath)[1]
+      let blob = await this.dicomToPng(item.imageIds[0])
+      let OSSclient = this.OSSclient
+      try {
+        let seriesRes = await OSSclient.put(thumbnailPath, blob)
+        if (seriesRes && seriesRes.url) {
+          let path = this.$getObjectName(seriesRes.url)
+          item.previewImageUrl = seriesRes.url
+          let data = {
+            seriesId: item.seriesId,
+            ImageResizePath: path
+          }
+          this.updateImageResizePath(data)
+        }
+      } catch (e) {
+
+      }
+    },
+    dicomToPng(imageId) {
+      return new Promise((resolve) => {
+        cornerstone.loadImage(imageId).then(async (image) => {
+          let width = image.columns, height = image.rows;
+          let canvas = document.createElement('canvas')
+          canvas.width = (width * 60) / height
+          canvas.height = 60
+          if (image) {
+            cornerstone.renderToCanvas(canvas, image)
+            // 将 Canvas 图像对象转换为 PNG 格式
+            let blob = await this.canvasToBlob(canvas)
+            resolve(blob)
+          } else {
+            resolve()
+          }
+        })
+      }).catch((reason) => {
+        reason()
+      })
+    },
+    canvasToBlob(canvas) {
+      return new Promise((resolve) => {
+        canvas.toBlob((blob) => {
+          resolve(blob)
+        })
+      })
+    },
    async loadStudy() {
      let params = {}
      if (this.isPacs) {
@ -891,6 +954,7 @@ export default {
          // 设置当前序列状态为已下载完成
          this.seriesList[seriesIndex].loadStatus = true
          workSpeedclose()
+          localStorage.setItem("QCRiskControl", 1)
          if (!this.isFromCRCUpload) {
            this.loadAllImages()
          }
@ -901,7 +965,18 @@ export default {
 }
 </script>

-<style>
+<style lang="scss" scoped>
+.imageBox {
+  position: relative;
+
+  i {
+    position: absolute;
+    top: 0;
+    left: 0;
+    cursor: pointer;
+  }
+}
+
 .viewerContainer .el-tabs--border-card {
  background: none;
  border: none;
--- a/src/views/dicom-show/dicom-visit.vue
+++ b/src/views/dicom-show/dicom-visit.vue
@ -45,8 +45,12 @@
                          style="position: relative;margin-bottom:5px;border-radius: 2px;border: 1px solid #404040;"
                          series-type="current" @click="showSeriesImage($event, index, i, series)">
                          <div class="viewernavigatorwrapper">
+                            <div class="imageBox" style="width: 72px;height:72px;">
                              <img class="image-preview" :src="series.previewImageUrl" crossorigin="anonymous" alt=""
-                              style="width: 85px;height:85px;" fit="fill">
+                                style="width: 72px;height:72px;" fit="fill" />
+                              <i class="el-icon-refresh" :title="$t('tip:refreshImage')"
+                                @click.stop="refreshImage(series)"></i>
+                            </div>
                            <div class="viewernavitextwrapper">
                              <div style="padding: 1px 5px 1px 1px;display: flex;justify-content: space-between;">
                                <div>#{{ series.seriesNumber }}</div>
@ -113,8 +117,8 @@
                                </div>
                              </el-tooltip>
                              <div style="padding: 1px;">
-                                {{ series.imageloadedArr.length }}/{{ series.instanceCount }}
-                              </div>
+                                {{ series.imageloadedArr.length <= series.instanceCount ? series.imageloadedArr.length :
+                                  series.instanceCount }}/{{ series.instanceCount }} </div>
                                  <div />
                              </div>
                            </div>
@ -184,8 +188,12 @@
                                  <div class="viewernavigatorwrapper"
                                    style="position: relative;border:1px solid #434343;" series-type="relation"
                                    @click="showRelationSeriesImage($event, seriesItem, studyIndex, index)">
-                                    <img class="image-preview" :src="seriesItem.previewImageUrl" crossorigin="anonymous"
-                                      alt="" style="width: 85px;height:85px;" fit="fill">
+                                    <div class="imageBox" style="width: 72px;height:72px;">
+                                      <img class="image-preview" :src="seriesItem.previewImageUrl"
+                                        crossorigin="anonymous" alt="" style="width: 72px;height:72px;" fit="fill" />
+                                      <i class="el-icon-refresh" :title="$t('tip:refreshImage')"
+                                        @click.stop="refreshImage(item)"></i>
+                                    </div>

                                    <div class="viewernavitextwrapper">
                                      <div
@ -273,7 +281,7 @@ import * as cornerstone from 'cornerstone-core'
 import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'
 import dicomViewer from '@/components/Dicom/DicomViewer'
 import { getVisitStudyList, getAllRelationStudyList, getSeriesList } from '@/api/reading'
-import { setSeriesStatus, setInstanceStatus } from '@/api/trials'
+import { setSeriesStatus, setInstanceStatus, updateImageResizePath } from '@/api/trials'
 import { getTaskUploadedDicomStudyList } from '@/api/reading'
 import requestPoolManager from '@/utils/request-pool'
 import store from '@/store'
@ -358,17 +366,76 @@ export default {
    workSpeedclose(true)
  },
  methods: {
+    async updateImageResizePath(data) {
+      try {
+        let res = await updateImageResizePath(data)
+        if (res.IsSuccess) {
+          this.$message.success(this.$t("message:tip:updateImageResizePath:success"))
+        }
+      } catch (err) {
+        console.log(err)
+      }
+    },
+    async refreshImage(item) {
+      let thumbnailPath = item.previewImageUrl.split(this.OSSclientConfig.basePath)[1]
+      let blob = await this.dicomToPng(item.imageIds[0])
+      let OSSclient = this.OSSclient
+      try {
+        let seriesRes = await OSSclient.put(thumbnailPath, blob)
+        if (seriesRes && seriesRes.url) {
+          let path = this.$getObjectName(seriesRes.url)
+          item.previewImageUrl = seriesRes.url
+          let data = {
+            seriesId: item.seriesId,
+            ImageResizePath: path
+          }
+          this.updateImageResizePath(data)
+        }
+      } catch (e) {
+
+      }
+    },
+    dicomToPng(imageId) {
+      return new Promise((resolve) => {
+        cornerstone.loadImage(imageId).then(async (image) => {
+          let width = image.columns, height = image.rows;
+          let canvas = document.createElement('canvas')
+          canvas.width = (width * 60) / height
+          canvas.height = 60
+          if (image) {
+            cornerstone.renderToCanvas(canvas, image)
+            // 将 Canvas 图像对象转换为 PNG 格式
+            let blob = await this.canvasToBlob(canvas)
+            resolve(blob)
+          } else {
+            resolve()
+          }
+        })
+      }).catch((reason) => {
+        reason()
+      })
+    },
+    canvasToBlob(canvas) {
+      return new Promise((resolve) => {
+        canvas.toBlob((blob) => {
+          resolve(blob)
+        })
+      })
+    },
    // 获取某个访视下所有的检查信息
    async getStudiesInfo() {
      this.studyList = []
      try {
        let res = null
        if (this.page === 'upload') {
-          res = await getTaskUploadedDicomStudyList({ visitTaskId: this.visitTaskId })
-        } else if (this.page === 'download') {
-          res = await getVisitStudyList(this.trialId, this.subjectVisitId, this.isReading, this.visitTaskId)
-        } else {
-          res = await getVisitStudyList(this.trialId, this.subjectVisitId, this.isReading)
+          res = await getTaskUploadedDicomStudyList({ visitTaskId: this.visitTaskId !== 'undefined' ? this.visitTaskId : null, subjectVisitId: this.subjectVisitId })
+        }
+        // else if (this.page === 'download') {
+        //   res = await getVisitStudyList(this.trialId, this.subjectVisitId, this.isReading, this.visitTaskId)
+        // }
+        else {
+          // res = await getVisitStudyList(this.trialId, this.subjectVisitId, this.isReading)
+          res = await getVisitStudyList(this.trialId, this.subjectVisitId, this.isReading, this.visitTaskId !== 'undefined' ? this.visitTaskId : null)
        }
        if (res.IsSuccess) {
          res.Result.forEach((study, studyIndex) => {
@ -937,13 +1004,25 @@ export default {
          this.loadAllImages()
        }
        workSpeedclose()
+        localStorage.setItem("QCRiskControl", 1)
      }
    }
  }
 }
 </script>

-<style>
+<style lang="scss">
+.imageBox {
+  position: relative;
+
+  i {
+    position: absolute;
+    top: 0;
+    left: 0;
+    cursor: pointer;
+  }
+}
+
 .viewerContainer .el-tabs--border-card {
  background: none;
  border: none;
--- a/src/views/dictionary/attachment/components/SignatureTemplate/attachmentPreview.vue
+++ b/src/views/dictionary/attachment/components/SignatureTemplate/attachmentPreview.vue
@ -106,6 +106,16 @@ export default {
        isTrial: {
            type: Boolean,
            default: false
+        },
+        isExternal: {
+            type: Boolean,
+            default: false
+        },
+        ExternalList: {
+            type: Array,
+            default: () => {
+                return []
+            }
        }
    },
    data() {
@ -122,7 +132,8 @@ export default {
            rowData: {},
            list: [],
            searchData: defaultSearchData(),
-            title: this.$t('dictionary:signature:fileList')
+            title: this.$t('dictionary:signature:fileList'),
+            loading: false
        }
    },
    watch: {
@ -131,6 +142,16 @@ export default {
                this.getList()
            },
            immediate: true,
+        },
+        isExternal: {
+            handler() {
+                if (this.isExternal) {
+                    this.list = this.ExternalList
+                    this.rowData = this.list[0] || {}
+                    this.title = this.$t('dictionary:signature:view')
+                }
+            },
+            immediate: true
        }
    },
    methods: {
@ -145,6 +166,7 @@ export default {
        },
        async getList() {
            try {
+                if (this.isExternal) return
                if (!this.SystemDocumentId) return false
                this.loading = true
                if (!this.isTrial) {
--- a/src/views/dictionary/checkConfig/index.vue
+++ b/src/views/dictionary/checkConfig/index.vue
@ -1,75 +1,118 @@
 <template>
  <div class="app-container my_menu">
    <el-form :inline="true">
-      <el-form-item label="模块">
-        <el-select v-model="queryParams.ModuleTypeId" placeholder="模块" clearable>
+      <!-- 模块 -->
+      <el-form-item :label="$t('audit:label:moduleType')">
+        <el-select v-model="queryParams.ModuleTypeId" clearable>
          <el-option v-for="item of dict.type.ModuleType" :key="`ModuleTypeId${item.value}`" :value="item.value"
            :label="item.raw.ValueCN" />
        </el-select>
      </el-form-item>
      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-        <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">
+          {{ $t('common:button:search') }}
+        </el-button>
+        <el-button type="primary" icon="el-icon-plus" @click="handleAdd">
+          {{ $t('common:button:new') }}
+        </el-button>
      </el-form-item>
    </el-form>
    <div>
-      <el-button type="info" plain icon="el-icon-sort" size="mini" @click="toggleExpandAll">展开/折叠</el-button>
+      <!-- 展开/折叠 -->
+      <el-button type="info" plain icon="el-icon-sort" size="mini" @click="toggleExpandAll">
+        {{ $t('audit:button:fold') }}
+      </el-button>
    </div>
    <el-table v-if="refreshTable" v-adaptive="{ bottomOffset: 45 }" v-loading="loading" height="100" :data="menuList"
      :default-expand-all="isExpandAll" row-key="Id" :tree-props="{ children: 'Children', hasChildren: 'hasChildren' }">
-      <el-table-column prop="ModuleTypeValueCN" label="模块" show-overflow-tooltip align="left" min-width="230px" />
-      <el-table-column prop="Description" label="操作名称" :show-overflow-tooltip="true" min-width="200px">
+      <!-- 模块 -->
+      <el-table-column prop="ModuleTypeValueCN" :label="$t('audit:label:moduleType')" show-overflow-tooltip align="left" min-width="230px" />
+      <!-- 操作名称 -->
+      <el-table-column prop="Description" :label="$t('audit:label:desc')" :show-overflow-tooltip="true" min-width="200px">
        <template slot-scope="scope">
          <span>{{ scope.row.DescriptionCN }}（{{ scope.row.Description }}）</span>
        </template>
      </el-table-column>
-      <el-table-column prop="DescriptionCN" label="其他" :show-overflow-tooltip="true" min-width="140px">
+      <!-- 其他 -->
+      <el-table-column prop="DescriptionCN" :label="$t('audit:label:descCN')" :show-overflow-tooltip="true" min-width="140px">
        <template slot-scope="scope">
+          <!-- 被禁用 -->
+           <!-- 禁 -->
          <span v-if="!scope.row.IsEnable"
            style="cursor:pointer;line-height:20px;text-align:center;font-size: 12px;display: inline-block;width: 20px;height: 20px;border-radius: 50%;background: 	#DC143C;color: #fff;"
-            title="被禁用">禁</span>
+            :title="$t('audit:label:disable')">{{ $t('audit:label:disable1') }}</span>
+          <!-- 需要电签 签 -->
          <span v-if="scope.row.IsHaveSign"
            style="cursor:pointer;line-height:20px;text-align:center;font-size: 12px;display: inline-block;width: 20px;height: 20px;border-radius: 50%;background: #428bca;color: #fff;"
-            title="需要电签">签</span>
+            :title="$t('audit:label:needSign')">{{ $t('audit:label:needSign1') }}</span>
+          <!-- 需要原因 因 -->
          <span v-if="scope.row.IsHaveReason"
            style="cursor:pointer;line-height:20px;text-align:center;font-size: 12px;display: inline-block;width: 20px;height: 20px;border-radius: 50%;background: #fab6b6;color: #fff;"
-            title="需要原因">因</span>
+            :title="$t('audit:label:needReason')">{{ $t('audit:label:needReason1') }}</span>
+            <!-- 已经记录 记 -->
          <span v-if="scope.row.IsFinish"
            style="cursor:pointer;line-height:20px;text-align:center;font-size: 12px;display: inline-block;width: 20px;height: 20px;border-radius: 50%;background:#3CB371;color: #fff;"
-            title="已经记录">记</span>
+            :title="$t('audit:label:isFinish')">{{ $t('audit:label:isFinish1') }}</span>
+            <!-- 核对完 核 -->
          <span v-if="scope.row.IsJoinPlan"
            style="cursor:pointer;line-height:20px;text-align:center;font-size: 12px;display: inline-block;width: 20px;height: 20px;border-radius: 50%;background: #FFA500;color: #fff;"
-            title="核对完">核</span>
+            :title="$t('audit:label:isJoinPlan')">{{ $t('audit:label:isJoinPlan1') }}</span>

        </template>
      </el-table-column>
-      <el-table-column prop="Identification" label="标识" :show-overflow-tooltip="true" min-width="200px" />
-      <el-table-column prop="OptTypeValueCN" label="操作类型" show-overflow-tooltip width="100px" />
-      <el-table-column prop="ObjectTypeValueCN" label="对象类型" show-overflow-tooltip min-width="100px" />
-      <el-table-column prop="ChildrenTypeValueCN" label="数据类型" show-overflow-tooltip min-width="100px" />
-      <el-table-column prop="Sort" label="显示顺序" min-width="80" show-overflow-tooltip />
-      <el-table-column label="启用" align="center" prop="CreateTime" min-width="80">
+      <!-- 标识 -->
+      <el-table-column prop="Identification" :label="$t('audit:label:identification')" :show-overflow-tooltip="true" min-width="200px" />
+      <!-- 操作类型 -->
+      <el-table-column prop="OptTypeValueCN" :label="$t('audit:label:optType')" show-overflow-tooltip width="100px" />
+      <!-- 对象类型 -->
+      <el-table-column prop="ObjectTypeValueCN" :label="$t('audit:label:objectType')" show-overflow-tooltip min-width="100px" />
+      <!-- 数据类型 -->
+      <el-table-column prop="ChildrenTypeValueCN" :label="$t('audit:label:dataType')" show-overflow-tooltip min-width="100px" />
+      <!-- 显示顺序 -->
+      <el-table-column prop="Sort" :label="$t('audit:label:sort')" min-width="80" show-overflow-tooltip />
+      <!-- 启用 -->
+      <el-table-column :label="$t('audit:label:isEnable')" align="center" prop="CreateTime" min-width="80">
+        <!-- 启用/禁用 -->
        <template slot-scope="scope">
-          <el-tag v-if="scope.row.IsEnable" size="success">启用</el-tag>
-          <el-tag v-else size="danger">禁用</el-tag>
+          <!-- <el-tag v-if="scope.row.IsEnable" size="success">启用</el-tag>
+          <el-tag v-else size="danger">禁用</el-tag> -->
+          <el-tag :type="!scope.row.IsEnable ? 'info' : ''">
+            {{ $fd('IsEnable', scope.row.IsEnable) }}
+          </el-tag>
        </template>
      </el-table-column>
-      <el-table-column label="操作" align="center" fixed="right" min-width="340" class-name="small-padding fixed-width">
+      <el-table-column :label="$t('common:action:action')" align="center" fixed="right" min-width="340" class-name="small-padding fixed-width">
        <template slot-scope="scope">
+          <!-- 上移 -->
          <el-button
            v-if="scope.row.ModuleTypeValueCN && scope.row.ObjectTypeValueCN && scope.row.OptTypeValueCN && scope.row.ChildrenTypeValueCN"
-            type="text" @click="handleUpMove(scope.row)">上移</el-button>
-          <el-button type="text" @click="handleUpdate(scope.row)">修改</el-button>
+            type="text" @click="handleUpMove(scope.row)"
+          >
+            {{ $t('audit:button:upward') }}
+          </el-button>
+          <!-- 修改 -->
+          <el-button type="text" @click="handleUpdate(scope.row)">
+            {{ $t('audit:button:modify') }}
+          </el-button>
+          <!-- 新增 -->
          <el-button
            v-if="!(scope.row.ModuleTypeValueCN && scope.row.ObjectTypeValueCN && scope.row.OptTypeValueCN && scope.row.ChildrenTypeValueCN)"
-            type="text" @click="handleAdd(scope.row)">新增</el-button>
+            type="text" @click="handleAdd(scope.row)">{{ $t('common:button:new') }}</el-button>
+          <!-- Children -->
          <el-button
            v-if="scope.row.ModuleTypeValueCN && scope.row.ObjectTypeValueCN && scope.row.OptTypeValueCN && scope.row.ChildrenTypeValueCN"
-            type="text" @click="handleChildren(scope.row)">Children</el-button>
+            type="text" @click="handleChildren(scope.row)"
+          >
+            {{ $t('audit:button:children') }}
+          </el-button>
+          <!-- 复制到 -->
          <el-button
            v-if="scope.row.ModuleTypeValueCN && scope.row.ObjectTypeValueCN && scope.row.OptTypeValueCN && scope.row.ChildrenTypeValueCN"
-            type="text" @click="handleCopy(scope.row)">复制到</el-button>
-          <el-button type="text" @click="handleDelete(scope.row)">删除</el-button>
+            type="text" @click="handleCopy(scope.row)">
+            {{ $t('audit:button:copyTo') }}
+          </el-button>
+            <!-- 删除 -->
+          <el-button type="text" @click="handleDelete(scope.row)">{{ $t('common:button:delete') }}</el-button>
        </template>
      </el-table-column>
    </el-table>
@ -191,6 +234,17 @@
              </el-radio-group>
            </el-form-item>
          </el-col>
+          <el-col :span="24">
+            <el-form-item>
+              <span slot="label">
+                适用的标准
+              </span>
+              <el-select v-model="form.ApplyCriterionList" placeholder="" clearable multiple>
+                <el-option v-for="item in $d.CriterionType" :key="item.id" :label="item.label" :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
          <el-col v-show="form.ConfigType === 'C' && title !== '复制'" :span="12">
            <el-form-item>
              <span slot="label">
@ -1008,6 +1062,7 @@ export default {
        ValueCN: null,
        EnumType: '',
        IsShowByTrialConfig: false,
+        ApplyCriterionList: [],
        TrialConfigRelyFieldName: null,
        Identification: null,
        IsForwardPosition: false,
--- a/src/views/dictionary/newdictionary/bool/index.vue
+++ b/src/views/dictionary/newdictionary/bool/index.vue
@ -3,11 +3,11 @@
    <!-- 搜索框 -->
    <div class="search">
      <el-form :inline="true" class="base-search-form">
-        <el-form-item label="字典表名称:">
+        <el-form-item :label="$t('dic:all:label:code')">
          <el-input v-model="searchData.Code" clearable style="width:120px;" />
        </el-form-item>
-        <el-form-item label="字典分组:">
-          <el-select v-model="searchData.ConfigTypeId" placeholder="字典分组" clearable size="small">
+        <el-form-item :label="$t('dic:all:label:group')">
+          <el-select v-model="searchData.ConfigTypeId" clearable size="small">
            <el-option v-for="item of basicDicList" :key="item.Id" :value="item.Id" :label="item.Code" />
          </el-select>
        </el-form-item>
@ -29,7 +29,9 @@
        </el-form-item>
      </el-form>
      <span style="margin-left:auto">
-        <el-button type="primary" @click="handleAdd">新建</el-button>
+        <el-button type="primary" @click="handleAdd">
+          {{ $t('common:button:new') }}
+        </el-button>
      </span>
    </div>
    <el-table
@ -44,33 +46,33 @@
      <el-table-column type="index" width="60" />
      <el-table-column
        prop="Code"
-        label="字典表名称"
+        :label="$t('dic:all:label:code')"
        sortable="custom"
        min-width="180"
        show-overflow-tooltip
      />
      <el-table-column
        prop="ConfigType"
-        label="字典分组"
+        :label="$t('dic:all:label:group')"
        sortable="custom"
        min-width="180"
        show-overflow-tooltip
      />
      <el-table-column
        prop="Description"
-        label="描述"
+        :label="$t('dic:all:label:desc')"
        sortable="custom"
        min-width="180"
        show-overflow-tooltip
      />
      <el-table-column
        prop="ShowOrder"
-        label="显示顺序"
+        :label="$t('dic:all:label:showOrder')"
        sortable="custom"
        min-width="180"
        show-overflow-tooltip
      />
-      <el-table-column label="是否可用" width="100" fixed="right">
+      <el-table-column :label="$t('dic:all:label:isEnable')" width="100" fixed="right">
        <template slot-scope="scope">
          <el-switch
            v-model="scope.row.IsEnable"
@ -80,25 +82,25 @@
          />
        </template>
      </el-table-column>
-      <el-table-column label="操作" width="200" fixed="right">
+      <el-table-column :label="$t('common:action:action')" width="200" fixed="right">
        <template slot-scope="scope">
          <el-button
            type="text"
            @click="handleEdit(scope.row)"
          >
-            编辑
+            {{ $t('common:action:edit') }}
          </el-button>
          <el-button
            type="text"
            @click="handleChild(scope.row)"
          >
-            子项
+            {{ $t('dic:all:label:childItem') }}
          </el-button>
          <el-button
            type="text"
            @click="handleDelete(scope.row)"
          >
-            删除
+            {{ $t('common:button:delete') }}
          </el-button>
        </template>
      </el-table-column>
@ -174,7 +176,7 @@ export default {
    switchChange(event, item) {
      this.loading = true
      addOrUpdateBasicDic(item).then(res => {
-        this.$message.success('Saved successfully!')
+        this.$message.success(this.$t('common:message:savedSuccessfully'))
        this.loading = false
      }).catch(() => {
        this.loading = false
@ -182,12 +184,12 @@ export default {
    },
    handleEdit(row) {
      this.$nextTick(() => {
-        this.$refs['DictionaryTypeConfigForm'].openDialog('DictionaryTypeConfig', row)
+        this.$refs['DictionaryTypeConfigForm'].openDialog(this.$t('common:action:edit'), row)
      })
    },
    handleAdd() {
      this.$nextTick(() => {
-        this.$refs['DictionaryTypeConfigForm'].openDialog('DictionaryTypeConfig', { DataTypeEnum: 3 })
+        this.$refs['DictionaryTypeConfigForm'].openDialog(this.$t('common:button:new'), { DataTypeEnum: 3 })
      })
    },
    handleDelete(row) {
--- a/src/views/dictionary/newdictionary/components/DictionaryChild.vue
+++ b/src/views/dictionary/newdictionary/components/DictionaryChild.vue
@ -4,32 +4,39 @@
    <div class="search">
      <el-form :inline="true" size="mini" class="base-search-form" />
      <span style="margin-left:auto">
-        <el-button type="primary" size="mini" @click="handleAdd">新建</el-button>
+        <el-button type="primary" size="mini" @click="handleAdd">{{ $t('common:button:new') }}</el-button>
      </span>
    </div>
    <el-table v-loading="loading" v-adaptive="{ bottomOffset: 45 }" :data="list" stripe size="small" height="100"
      @sort-change="handleSortByColumn">
      <el-table-column type="index" width="60" />
-      <el-table-column v-if="!~$route.path.indexOf('select')" prop="Code" label="字典键值" min-width="180"
+      <!-- 字典键值 -->
+      <el-table-column v-if="!~$route.path.indexOf('select')" prop="Code" :label="$t('dic:all:label:keyCode')" min-width="180"
        show-overflow-tooltip sortable='custom' />
-      <el-table-column prop="ValueCN" label="中文值" min-width="180" show-overflow-tooltip sortable='custom' />
-      <el-table-column prop="Value" label="英文值" min-width="180" show-overflow-tooltip sortable='custom' />
-      <el-table-column prop="ChildGroup" label="分组" min-width="180" show-overflow-tooltip sortable='custom' />
-      <el-table-column prop="ShowOrder" label="显示顺序" min-width="180" show-overflow-tooltip sortable='custom' />
-      <el-table-column prop="Description" label="描述" min-width="180" show-overflow-tooltip sortable='custom' />
-      <el-table-column label="是否可用" width="100" fixed="right">
+      <!-- 中文值 -->
+      <el-table-column prop="ValueCN" :label="$t('dic:all:label:valueCN')" min-width="180" show-overflow-tooltip sortable='custom' />
+      <!-- 英文值 -->
+      <el-table-column prop="Value" :label="$t('dic:all:label:valueEN')" min-width="180" show-overflow-tooltip sortable='custom' />
+      <!-- 分组 -->
+      <el-table-column prop="ChildGroup" :label="$t('dic:all:label:childGroup')" min-width="180" show-overflow-tooltip sortable='custom' />
+      <!-- 显示顺序 -->
+      <el-table-column prop="ShowOrder" :label="$t('dic:all:label:showOrder')" min-width="180" show-overflow-tooltip sortable='custom' />
+      <!-- 描述 -->
+      <el-table-column prop="Description" :label="$t('dic:all:label:desc')" min-width="180" show-overflow-tooltip sortable='custom' />
+      <!-- 是否可用 -->
+      <el-table-column :label="$t('dic:all:label:isEnable')" width="100" fixed="right">
        <template slot-scope="scope">
          <el-switch v-model="scope.row.IsEnable" :active-value="true" :inactive-value="false"
            @change="(event) => { return switchChange(event, scope.row) }" />
        </template>
      </el-table-column>
-      <el-table-column label="操作" width="150" fixed="right">
+      <el-table-column :label="$t('common:action:action')" width="150" fixed="right">
        <template slot-scope="scope">
          <el-button type="text" @click="handleEdit(scope.row)">
-            编辑
+            {{ $t('common:action:edit') }}
          </el-button>
          <el-button type="text" @click="handleDelete(scope.row)">
-            删除
+            {{ $t('common:button:delete') }}
          </el-button>
        </template>
      </el-table-column>
@ -101,7 +108,7 @@ export default {
    switchChange(event, item) {
      this.loading = true
      addOrUpdateBasicDic(item).then(res => {
-        this.$message.success('Saved successfully!')
+        this.$message.success(this.$t('common:message:savedSuccessfully'))
        this.loading = false
      }).catch(() => {
        this.loading = false
@ -109,12 +116,12 @@ export default {
    },
    handleEdit(row) {
      this.$nextTick(() => {
-        this.$refs['DictionaryChildAddOrUpdateForm'].openDialog('DictionaryChild Edit', row, { DataTypeEnum: this.parent.DataTypeEnum })
+        this.$refs['DictionaryChildAddOrUpdateForm'].openDialog(this.$t('common:action:edit'), row, { DataTypeEnum: this.parent.DataTypeEnum })
      })
    },
    handleAdd() {
      this.$nextTick(() => {
-        this.$refs['DictionaryChildAddOrUpdateForm'].openDialog('DictionaryChild Add', {}, { ConfigTypeId: this.parent.ConfigTypeId, parentId: this.parent.Id, DataTypeEnum: this.parent.DataTypeEnum })
+        this.$refs['DictionaryChildAddOrUpdateForm'].openDialog(this.$t('common:button:new'), {}, { ConfigTypeId: this.parent.ConfigTypeId, parentId: this.parent.Id, DataTypeEnum: this.parent.DataTypeEnum })
      })
    },
    handleDelete(row) {
--- a/src/views/dictionary/newdictionary/components/DictionaryChildAddOrUpdateForm.vue
+++ b/src/views/dictionary/newdictionary/components/DictionaryChildAddOrUpdateForm.vue
@ -8,25 +8,25 @@
        label-width="120px"
        size="small"
      >
-        <el-form-item label="Enum Value: " prop="Code">
+        <el-form-item :label="$t('dic:all:label:keyCode')"  prop="Code">
          <el-input v-model="form.Code" />
        </el-form-item>
-        <el-form-item label="Value: " prop="Code">
+        <el-form-item :label="$t('dic:all:label:valueCN')" prop="Code">
          <el-input v-model="form.ValueCN" />
        </el-form-item>
-        <el-form-item label="Value EN: " prop="Code">
+        <el-form-item :label="$t('dic:all:label:valueEN')" prop="Code">
          <el-input v-model="form.Value" />
        </el-form-item>
-        <el-form-item label="ChildGroup: " prop="Code">
+        <el-form-item :label="$t('dic:all:label:childGroup')" prop="Code">
          <el-input v-model="form.ChildGroup" />
        </el-form-item>
-        <el-form-item label="ShowOrder: " prop="Code">
+        <el-form-item :label="$t('dic:all:label:showOrder')" prop="Code">
          <el-input-number v-model="form.ShowOrder" :min="0"  />
        </el-form-item>
-        <el-form-item label="Description: " prop="Code">
+        <el-form-item :label="$t('dic:all:label:desc')" prop="Code">
          <el-input v-model="form.Description" />
        </el-form-item>
-        <el-form-item label="Is Enable: ">
+        <el-form-item :label="$t('dic:all:label:isEnable')">
          <el-switch
            v-model="form.IsEnable"
            :active-value="true"
@ -36,8 +36,12 @@
      </el-form>
    </template>
    <template slot="dialog-footer">
-      <el-button :disabled="btnLoading" size="small" type="primary" @click="handleCancle">Cancel</el-button>
-      <el-button size="small" type="primary" :loading="btnLoading" @click="handleSave">Save</el-button>
+      <el-button :disabled="btnLoading" size="small" type="primary" @click="handleCancle">
+        {{ $t('common:button:cancel') }}
+      </el-button>
+      <el-button size="small" type="primary" :loading="btnLoading" @click="handleSave">
+        {{ $t('common:button:save') }}
+      </el-button>
    </template>
  </base-model>
 </template>
@ -90,7 +94,7 @@ export default {
          this.btnLoading = true
          addOrUpdateBasicDic(this.form).then(res => {
            this.btnLoading = false
-            this.$message.success('Saved successfully!')
+            this.$message.success(this.$t('common:message:savedSuccessfully'))
            this.model_cfg.visible = false
            this.$emit('getList')
          }).catch(() => {
--- a/src/views/dictionary/newdictionary/components/DictionaryTypeConfigForm.vue
+++ b/src/views/dictionary/newdictionary/components/DictionaryTypeConfigForm.vue
@ -8,7 +8,8 @@
        label-width="120px"
        size="small"
      > 
-        <el-form-item label="ConfigTypeId: " prop="Code">
+        <!-- 字典分组 -->
+        <el-form-item :label="$t('dic:all:label:group')" prop="Code">
          <el-select v-model="form.ConfigTypeId" filterable style="width:100%;">
            <el-option
              v-for="(item,index) of basicDicList"
@ -18,7 +19,8 @@
            />
          </el-select>
        </el-form-item>
-        <el-form-item label="TypeEnum: " prop="DataTypeEnum">
+        <!-- 类型 -->
+        <el-form-item :label="$t('dic:all:label:dataType')" prop="DataTypeEnum">
          <el-select v-model="form.DataTypeEnum" filterable style="width:100%;">
            <el-option
              :label="`config`"
@ -38,16 +40,19 @@
            />
          </el-select>
        </el-form-item>
-        <el-form-item label="Code: " prop="Code">
+        <!-- 字典表名称 -->
+        <el-form-item :label="$t('dic:all:label:code')" prop="Code">
          <el-input v-model="form.Code" />
        </el-form-item>
        <!--<el-form-item label="KeyName: " prop="Code">-->
        <!--<el-input v-model="form.KeyName" />-->
        <!--</el-form-item>-->
-        <el-form-item label="ShowOrder: " prop="Code">
+        <!-- 显示顺序 -->
+        <el-form-item :label="$t('dic:all:label:showOrder')" prop="Code">
          <el-input-number v-model="form.ShowOrder" :min="0"  />
        </el-form-item>
-        <el-form-item label="Description: " prop="Code">
+        <!-- 描述 -->
+        <el-form-item :label="$t('dic:all:label:desc')" prop="Code">
          <el-input v-model="form.Description" />
        </el-form-item>
        <!-- <el-form-item label="Value: " prop="Code">
@ -56,7 +61,8 @@
        <el-form-item label="ValueCN: " prop="Code">
          <el-input v-model="form.ValueCN" />
        </el-form-item> -->
-        <el-form-item label="Is Enable: ">
+        <!-- 是否启用 -->
+        <el-form-item :label="$t('dic:all:label:isEnable')">
          <el-switch
            v-model="form.IsEnable"
            :active-value="true"
@ -66,8 +72,12 @@
      </el-form>
    </template>
    <template slot="dialog-footer">
-      <el-button :disabled="btnLoading" size="small" type="primary" @click="handleCancle">Cancel</el-button>
-      <el-button size="small" type="primary" :loading="btnLoading" @click="handleSave">Save</el-button>
+      <el-button :disabled="btnLoading" size="small" type="primary" @click="handleCancle">
+        {{ $t('common:button:cancel') }}
+      </el-button>
+      <el-button size="small" type="primary" :loading="btnLoading" @click="handleSave">
+        {{ $t('common:button:save') }}
+      </el-button>
    </template>
  </base-model>
 </template>
@ -103,8 +113,8 @@ export default {
      btnLoading: false,
      form: formDataDefault(),
      rules: {
-        Code: [{ required: true, message: 'Please specify', trigger: 'blur' }],
-        DataTypeEnum: [{ required: true, message: 'Please specify', trigger: 'blur' }]
+        Code: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }],
+        DataTypeEnum: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }]
      },
      model_cfg: { visible: false, showClose: true, width: '600px', title: '', appendToBody: true }
    }
@ -132,7 +142,7 @@ export default {
          this.btnLoading = true
          addOrUpdateBasicDic(this.form).then(res => {
            this.btnLoading = false
-            this.$message.success('Saved successfully!')
+            this.$message.success(this.$t('common:message:savedSuccessfully'))
            this.model_cfg.visible = false
            this.$emit('getList')
          }).catch(() => {
--- a/src/views/dictionary/newdictionary/enum/index.vue
+++ b/src/views/dictionary/newdictionary/enum/index.vue
@ -3,11 +3,11 @@
    <!-- 搜索框 -->
    <div class="search">
      <el-form :inline="true" class="base-search-form">
-        <el-form-item label="字典表名称:">
+        <el-form-item :label="$t('dic:all:label:code')">
          <el-input v-model="searchData.Code" clearable style="width:120px;" />
        </el-form-item>
-        <el-form-item label="字典分组:">
-          <el-select v-model="searchData.ConfigTypeId" placeholder="字典分组" clearable size="small">
+        <el-form-item :label="$t('dic:all:label:group')">
+          <el-select v-model="searchData.ConfigTypeId" clearable size="small">
            <el-option v-for="item of basicDicList" :key="item.Id" :value="item.Id" :label="item.Code" />
          </el-select>
        </el-form-item>
@ -29,7 +29,9 @@
        </el-form-item>
      </el-form>
      <span style="margin-left:auto">
-        <el-button type="primary" @click="handleAdd">新建</el-button>
+        <el-button type="primary" @click="handleAdd">
+          {{ $t('common:button:new') }}
+        </el-button>
      </span>
    </div>
    <el-table
@ -44,33 +46,33 @@
      <el-table-column type="index" width="60" />
      <el-table-column
        prop="Code"
-        label="字典表名称"
+        :label="$t('dic:all:label:code')"
        sortable="custom"
        min-width="180"
        show-overflow-tooltip
      />
      <el-table-column
        prop="ConfigType"
-        label="字典分组"
+        :label="$t('dic:all:label:group')"
        sortable="custom"
        min-width="180"
        show-overflow-tooltip
      />
      <el-table-column
        prop="Description"
-        label="描述"
+        :label="$t('dic:all:label:desc')"
        sortable="custom"
        min-width="180"
        show-overflow-tooltip
      />
      <el-table-column
        prop="ShowOrder"
-        label="显示顺序"
+        :label="$t('dic:all:label:showOrder')"
        sortable="custom"
        min-width="180"
        show-overflow-tooltip
      />
-      <el-table-column label="是否可用" width="100" fixed="right">
+      <el-table-column :label="$t('dic:all:label:isEnable')" width="100" fixed="right">
        <template slot-scope="scope">
          <el-switch
            v-model="scope.row.IsEnable"
@ -80,25 +82,25 @@
          />
        </template>
      </el-table-column>
-      <el-table-column label="操作" width="200" fixed="right">
+      <el-table-column :label="$t('common:action:action')" width="200" fixed="right">
        <template slot-scope="scope">
          <el-button
            type="text"
            @click="handleEdit(scope.row)"
          >
-            编辑
+            {{ $t('common:action:edit') }}
          </el-button>
          <el-button
            type="text"
            @click="handleChild(scope.row)"
          >
-            子项
+            {{ $t('dic:all:label:childItem') }}
          </el-button>
          <el-button
            type="text"
            @click="handleDelete(scope.row)"
          >
-            删除
+            {{ $t('common:button:delete') }}
          </el-button>
        </template>
      </el-table-column>
@ -174,7 +176,7 @@ export default {
    switchChange(event, item) {
      this.loading = true
      addOrUpdateBasicDic(item).then(res => {
-        this.$message.success('Saved successfully!')
+        this.$message.success(this.$t('common:message:savedSuccessfully'))
        this.loading = false
      }).catch(() => {
        this.loading = false
@ -182,12 +184,12 @@ export default {
    },
    handleEdit(row) {
      this.$nextTick(() => {
-        this.$refs['DictionaryTypeConfigForm'].openDialog('DictionaryTypeConfig', row)
+        this.$refs['DictionaryTypeConfigForm'].openDialog(this.$t('common:action:edit'), row)
      })
    },
    handleAdd() {
      this.$nextTick(() => {
-        this.$refs['DictionaryTypeConfigForm'].openDialog('DictionaryTypeConfig', { DataTypeEnum: 2 })
+        this.$refs['DictionaryTypeConfigForm'].openDialog(this.$t('common:button:new'), { DataTypeEnum: 2 })
      })
    },
    handleDelete(row) {
--- a/src/views/dictionary/newdictionary/index.vue
+++ b/src/views/dictionary/newdictionary/index.vue
@ -1,19 +1,24 @@
 <template>
  <div>
    <el-tabs v-model="activeTab" @tab-click="handleClick">
-      <el-tab-pane label="全部" name="/dictionary/newDictionary/list">
+      <!-- 全部 -->
+      <el-tab-pane :label="$t('dic:label:all')" name="/dictionary/newDictionary/list">
        <dictList v-if="activeTab == '/dictionary/newDictionary/list'" />
      </el-tab-pane>
-      <el-tab-pane label="下拉框字典" name="/dictionary/newDictionary/select">
+      <!-- 下拉框字典 -->
+      <el-tab-pane :label="$t('dic:label:select')" name="/dictionary/newDictionary/select">
        <dictSelect v-if="activeTab == '/dictionary/newDictionary/select'" />
      </el-tab-pane>
-      <el-tab-pane label="枚举字典" name="/dictionary/newDictionary/enum">
+      <!-- 枚举字典 -->
+      <el-tab-pane :label="$t('dic:label:enum')" name="/dictionary/newDictionary/enum">
        <dictEnum v-if="activeTab == '/dictionary/newDictionary/enum'" />
      </el-tab-pane>
-      <el-tab-pane label="布尔字典" name="/dictionary/newDictionary/bool">
+      <!-- 布尔字典 -->
+      <el-tab-pane :label="$t('dic:label:bool')" name="/dictionary/newDictionary/bool">
        <dictBool v-if="activeTab == '/dictionary/newDictionary/bool'" />
      </el-tab-pane>
-      <el-tab-pane label="字典类型配置" name="/dictionary/newDictionary/config">
+      <!-- 字典类型配置 -->
+      <el-tab-pane :label="$t('dic:label:config')" name="/dictionary/newDictionary/config">
        <dictConfig v-if="activeTab == '/dictionary/newDictionary/config'" />
      </el-tab-pane>
    </el-tabs>
--- a/src/views/dictionary/newdictionary/list/components/DictionaryTypeConfigForm.vue
+++ b/src/views/dictionary/newdictionary/list/components/DictionaryTypeConfigForm.vue
@ -8,7 +8,8 @@
        label-width="120px"
        size="small"
      >
-        <el-form-item label="ConfigTypeId: " prop="Code">
+        <!-- 字典分组 -->
+        <el-form-item :label="$t('dic:all:label:group')" prop="Code">
          <el-select v-model="form.ConfigTypeId" filterable style="width:100%;">
            <el-option
              v-for="(item,index) of basicDicList"
@ -18,7 +19,8 @@
            />
          </el-select>
        </el-form-item>
-        <el-form-item label="DataTypeEnum: " prop="DataTypeEnum">
+        <!-- 类型 -->
+        <el-form-item :label="$t('dic:all:label:dataType')" prop="DataTypeEnum">
          <el-select v-model="form.DataTypeEnum" filterable style="width:100%;">
            <el-option
              :label="`config`"
@ -38,16 +40,19 @@
            />
          </el-select>
        </el-form-item>
-        <el-form-item label="Code: " prop="Code">
+        <!-- 字典表名称 -->
+        <el-form-item :label="$t('dic:all:label:code')" prop="Code">
          <el-input v-model="form.Code" />
        </el-form-item>
        <!--<el-form-item label="KeyName: " prop="Code">-->
        <!--<el-input v-model="form.KeyName" />-->
        <!--</el-form-item>-->
-        <el-form-item label="ShowOrder: " prop="Code">
+        <!-- 显示顺序 -->
+        <el-form-item :label="$t('dic:all:label:showOrder')" prop="Code">
          <el-input-number v-model="form.ShowOrder" :min="0" />
        </el-form-item>
-        <el-form-item label="Description: " prop="Code">
+        <!-- 描述 -->
+        <el-form-item :label="$t('dic:all:label:desc')" prop="Code">
          <el-input v-model="form.Description" />
        </el-form-item>
        <!-- <el-form-item label="Value: " prop="Code">
@ -56,7 +61,8 @@
        <el-form-item label="ValueCN: " prop="Code">
          <el-input v-model="form.ValueCN" />
        </el-form-item> -->
-        <el-form-item label="Is Enable: ">
+        <!-- 是否启用 -->
+        <el-form-item :label="$t('dic:all:label:isEnable')">
          <el-switch
            v-model="form.IsEnable"
            :active-value="true"
@ -66,8 +72,12 @@
      </el-form>
    </template>
    <template slot="dialog-footer">
-      <el-button :disabled="btnLoading" size="small" type="primary" @click="handleCancle">Cancel</el-button>
-      <el-button size="small" type="primary" :loading="btnLoading" @click="handleSave">Save</el-button>
+      <el-button :disabled="btnLoading" size="small" type="primary" @click="handleCancle">
+        {{ $t('common:button:cancel') }}
+      </el-button>
+      <el-button size="small" type="primary" :loading="btnLoading" @click="handleSave">
+        {{ $t('common:button:save') }}
+      </el-button>
    </template>
  </base-model>
 </template>
@ -103,8 +113,8 @@ export default {
      btnLoading: false,
      form: formDataDefault(),
      rules: {
-        Code: [{ required: true, message: 'Please specify', trigger: 'blur' }],
-        DataTypeEnum: [{ required: true, message: 'Please specify', trigger: 'blur' }]
+        Code: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }],
+        DataTypeEnum: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }]
      },
      model_cfg: { visible: false, showClose: true, width: '600px', title: '', appendToBody: true }
    }
@ -130,7 +140,7 @@ export default {
          this.btnLoading = true
          addOrUpdateBasicDic(this.form).then(res => {
            this.btnLoading = false
-            this.$message.success('Saved successfully!')
+            this.$message.success(this.$t('common:message:savedSuccessfully'))
            this.model_cfg.visible = false
            this.$emit('getList')
          }).catch(() => {
--- a/src/views/dictionary/newdictionary/list/index.vue
+++ b/src/views/dictionary/newdictionary/list/index.vue
@ -3,15 +3,18 @@
    <!-- 搜索框 -->
    <div class="search">
      <el-form :inline="true" class="base-search-form">
-        <el-form-item label="字典表名称:">
+        <!-- 字典表名称 -->
+        <el-form-item :label="$t('dic:all:label:code')">
          <el-input v-model="searchData.Code" clearable style="width:120px;" />
        </el-form-item>
-        <el-form-item label="字典分组:">
-          <el-select v-model="searchData.ConfigTypeId" placeholder="字典分组" clearable size="small">
+        <!-- 字典分组 -->
+        <el-form-item :label="$t('dic:all:label:group')">
+          <el-select v-model="searchData.ConfigTypeId" clearable size="small">
            <el-option v-for="item of basicDicList" :key="item.Id" :value="item.Id" :label="item.Code" />
          </el-select>
        </el-form-item>
-        <el-form-item label="关键字:">
+        <!-- 关键字 -->
+        <el-form-item :label="$t('dic:all:label:keyWord')">
          <el-input v-model="searchData.KeyInfo" clearable style="width:120px;" />
        </el-form-item>
        <el-form-item>
@ -32,8 +35,14 @@
        </el-form-item>
      </el-form>
      <span style="margin-left:auto">
-        <el-button type="primary" @click="handleAdd">新建</el-button>
-        <el-button type="primary" @click="handleBatchAdd">批量新建</el-button>
+        <!-- 新建 -->
+        <el-button type="primary" @click="handleAdd">
+          {{ $t('common:button:new') }}
+        </el-button>
+        <!-- 批量新建 -->
+        <el-button type="primary" @click="handleBatchAdd">
+          {{ $t('common:button:batchNew') }}
+        </el-button>
      </span>
    </div>
    <el-table
@ -46,16 +55,18 @@
      @sort-change="handleSortByColumn"
    >
      <el-table-column type="index" width="60" />
+      <!-- 字典表名称 -->
      <el-table-column
        prop="Code"
-        label="字典表名称"
+        :label="$t('dic:all:label:code')"
        sortable="custom"
        min-width="180"
        show-overflow-tooltip
      />
+      <!-- 类型 -->
      <el-table-column
        prop="DataTypeEnum"
-        label="类型"
+        :label="$t('dic:all:label:dataType')"
        sortable="custom"
        min-width="180"
        show-overflow-tooltip
@ -64,28 +75,32 @@
          {{ DataTypeEnumList[scope.row.DataTypeEnum] }}
        </template>
      </el-table-column>
+      <!-- 字典分组 -->
      <el-table-column
        prop="ConfigType"
-        label="字典分组"
+        :label="$t('dic:all:label:group')"
        sortable="custom"
        min-width="180"
        show-overflow-tooltip
      />
+      <!-- 描述 -->
      <el-table-column
        prop="Description"
-        label="描述"
+        :label="$t('dic:all:label:desc')"
        sortable="custom"
        min-width="180"
        show-overflow-tooltip
      />
+      <!-- 显示顺序 -->
      <el-table-column
        prop="ShowOrder"
-        label="显示顺序"
+        :label="$t('dic:all:label:showOrder')"
        sortable="custom"
        min-width="180"
        show-overflow-tooltip
      />
-      <el-table-column label="是否可用" width="100" fixed="right">
+      <!-- 是否可用 -->
+      <el-table-column :label="$t('dic:all:label:isEnable')" width="100" fixed="right">
        <template slot-scope="scope">
          <el-switch
            v-model="scope.row.IsEnable"
@ -95,25 +110,28 @@
          />
        </template>
      </el-table-column>
-      <el-table-column label="操作" width="300" fixed="right">
+      <el-table-column :label="$t('common:action:action')" width="300" fixed="right">
        <template slot-scope="scope">
+          <!-- 编辑 -->
          <el-button
            type="text"
            @click="handleEdit(scope.row)"
          >
-            编辑
+            {{ $t('common:action:edit') }}
          </el-button>
+          <!-- 子项 -->
          <el-button
            type="text"
            @click="handleChild(scope.row)"
          >
-            子项
+            {{ $t('dic:all:label:childItem') }}
          </el-button>
+          <!-- 删除 -->
          <el-button
            type="text"
            @click="handleDelete(scope.row)"
          >
-            删除
+            {{ $t('common:button:delete') }}
          </el-button>
        </template>
      </el-table-column>
@ -201,17 +219,17 @@ export default {
    },
    handleEdit(row) {
      this.$nextTick(() => {
-        this.$refs['DictionaryTypeConfigForm'].openDialog('DictionaryTypeConfig', row)
+        this.$refs['DictionaryTypeConfigForm'].openDialog(this.$t('common:action:edit'), row)
      })
    },
    handleAdd() {
      this.$nextTick(() => {
-        this.$refs['DictionaryTypeConfigForm'].openDialog('DictionaryTypeConfig', {})
+        this.$refs['DictionaryTypeConfigForm'].openDialog(this.$t('common:button:new'), {})
      })
    },
    handleBatchAdd() {
      this.$nextTick(() => {
-        this.$refs['batchAddForm'].openDialog('批量新建', {})
+        this.$refs['batchAddForm'].openDialog(this.$t('common:button:batchNew'), {})
      })
    },
    handleDelete(row) {
--- a/src/views/dictionary/newdictionary/select/index.vue
+++ b/src/views/dictionary/newdictionary/select/index.vue
@ -3,11 +3,11 @@
    <!-- 搜索框 -->
    <div class="search">
      <el-form :inline="true" class="base-search-form">
-        <el-form-item label="字典表名称:">
+        <el-form-item :label="$t('dic:all:label:code')">
          <el-input v-model="searchData.Code" clearable style="width:120px;" />
        </el-form-item>
-        <el-form-item label="字典分组:">
-          <el-select v-model="searchData.ConfigTypeId" placeholder="字典分组" clearable size="small">
+        <el-form-item :label="$t('dic:all:label:group')">
+          <el-select v-model="searchData.ConfigTypeId" clearable size="small">
            <el-option v-for="item of basicDicList" :key="item.Id" :value="item.Id" :label="item.Code" />
          </el-select>
        </el-form-item>
@ -29,8 +29,13 @@
        </el-form-item>
      </el-form>
      <span style="margin-left:auto">
-        <el-button type="primary" @click="handleSetting">配置字典分组</el-button>
-        <el-button type="primary" @click="handleAdd">新建</el-button>
+        <!-- 配置字典分组 -->
+        <el-button type="primary" @click="handleSetting">
+          {{ $t('dic:select:button:setting') }}
+        </el-button>
+        <el-button type="primary" @click="handleAdd">
+          {{ $t('common:button:new') }}
+        </el-button>
      </span>
    </div>
    <el-table
@ -45,33 +50,33 @@
      <el-table-column type="index" width="60" />
      <el-table-column
        prop="Code"
-        label="字典表名称"
+        :label="$t('dic:all:label:code')"
        sortable="custom"
        min-width="180"
        show-overflow-tooltip
      />
      <el-table-column
        prop="ConfigType"
-        label="字典分组"
+        :label="$t('dic:all:label:group')"
        sortable="custom"
        min-width="180"
        show-overflow-tooltip
      />
      <el-table-column
        prop="Description"
-        label="描述"
+        :label="$t('dic:all:label:desc')"
        sortable="custom"
        min-width="180"
        show-overflow-tooltip
      />
      <el-table-column
        prop="ShowOrder"
-        label="显示顺序"
+        :label="$t('dic:all:label:showOrder')"
        sortable="custom"
        min-width="180"
        show-overflow-tooltip
      />
-      <el-table-column label="是否可用" width="100" fixed="right">
+      <el-table-column :label="$t('dic:all:label:isEnable')" width="100" fixed="right">
        <template slot-scope="scope">
          <el-switch
            v-model="scope.row.IsEnable"
@ -81,25 +86,25 @@
          />
        </template>
      </el-table-column>
-      <el-table-column label="操作" width="300" fixed="right">
+      <el-table-column :label="$t('common:action:action')" width="300" fixed="right">
        <template slot-scope="scope">
          <el-button
            type="text"
            @click="handleEdit(scope.row)"
          >
-            编辑
+            {{ $t('common:action:edit') }}
          </el-button>
          <el-button
            type="text"
            @click="handleChild(scope.row)"
          >
-            子项
+            {{ $t('dic:all:label:childItem') }}
          </el-button>
          <el-button
            type="text"
            @click="handleDelete(scope.row)"
          >
-            删除
+            {{ $t('common:button:delete') }}
          </el-button>
        </template>
      </el-table-column>
@ -175,7 +180,7 @@ export default {
    switchChange(event, item) {
      this.loading = true
      addOrUpdateBasicDic(item).then(res => {
-        this.$message.success('Saved successfully!')
+        this.$message.success(this.$t('common:message:savedSuccessfully'))
        this.loading = false
      }).catch(() => {
        this.loading = false
@ -183,12 +188,12 @@ export default {
    },
    handleEdit(row) {
      this.$nextTick(() => {
-        this.$refs['DictionaryTypeConfigForm'].openDialog('DictionaryTypeConfig', row)
+        this.$refs['DictionaryTypeConfigForm'].openDialog(this.$t('common:action:edit'), row)
      })
    },
    handleAdd() {
      this.$nextTick(() => {
-        this.$refs['DictionaryTypeConfigForm'].openDialog('DictionaryTypeConfig', { DataTypeEnum: 1 })
+        this.$refs['DictionaryTypeConfigForm'].openDialog(this.$t('common:button:new'), { DataTypeEnum: 1 })
      })
    },
    handleDelete(row) {
--- a/src/views/dictionary/newdictionary/setting/DictionaryTypeConfigForm.vue
+++ b/src/views/dictionary/newdictionary/setting/DictionaryTypeConfigForm.vue
@ -8,13 +8,13 @@
        label-width="150px"
        size="small"
      >
-        <el-form-item label="Dictionary Type: " prop="Code">
+        <el-form-item :label="$t('dic:all:label:group')"" prop="Code">
          <el-input v-model="form.Code" />
        </el-form-item>
-        <el-form-item label="Description: " prop="Code">
+        <el-form-item :label="$t('dic:all:label:desc')">
          <el-input v-model="form.Description" />
        </el-form-item>
-        <el-form-item label="Is Enable: ">
+        <el-form-item :label="$t('dic:all:label:isEnable')">
          <el-switch
            v-model="form.IsEnable"
            :active-value="true"
@ -24,8 +24,12 @@
      </el-form>
    </template>
    <template slot="dialog-footer">
-      <el-button :disabled="btnLoading" size="small" type="primary" @click="handleCancle">Cancel</el-button>
-      <el-button size="small" type="primary" :loading="btnLoading" @click="handleSave">Save</el-button>
+      <el-button :disabled="btnLoading" size="small" type="primary" @click="handleCancle">
+        {{ $t('common:button:cancel') }}
+      </el-button>
+      <el-button size="small" type="primary" :loading="btnLoading" @click="handleSave">
+        {{ $t('common:button:save') }}
+      </el-button>
    </template>
  </base-model>
 </template>
@ -52,7 +56,7 @@ export default {
      btnLoading: false,
      form: formDataDefault(),
      rules: {
-        Code: [{ required: true, message: 'Please specify', trigger: 'blur' }]
+        Code: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }]
      },
      model_cfg: { visible: false, showClose: true, width: '600px', title: '' }
    }
--- a/src/views/dictionary/newdictionary/setting/index.vue
+++ b/src/views/dictionary/newdictionary/setting/index.vue
@ -3,10 +3,10 @@
    <!-- 搜索框 -->
    <div class="search">
      <el-form :inline="true" class="base-search-form">
-        <el-form-item label="Code:">
+        <el-form-item :label="$t('dic:all:label:group')">
          <el-input v-model="searchData.Code" clearable style="width:120px;" />
        </el-form-item>
-        <el-form-item label="KeyName:">
+        <el-form-item :label="$t('dic:all:label:keyWord')">
          <el-input v-model="searchData.KeyName" clearable style="width:120px;" />
        </el-form-item>
        <el-form-item>
@ -27,7 +27,9 @@
        </el-form-item>
      </el-form>
      <span style="margin-left:auto">
-        <el-button type="primary" @click="handleAdd">New</el-button>
+        <el-button type="primary" @click="handleAdd">
+          {{ $t('common:button:new') }}
+        </el-button>
      </span>
    </div>
    <el-table
@ -41,15 +43,15 @@
      <el-table-column type="index" width="60" />
      <el-table-column
        prop="Code"
-        label="Dictionary Type"
+        :label="$t('dic:all:label:group')"
        show-overflow-tooltip
      />
      <el-table-column
        prop="Description"
-        label="Description"
+        :label="$t('dic:all:label:desc')"
        show-overflow-tooltip
      />
-      <el-table-column label="Is Enable" width="100" fixed="right">
+      <el-table-column :label="$t('dic:all:label:isEnable')" width="100" fixed="right">
        <template slot-scope="scope">
          <el-switch
            v-model="scope.row.IsEnable"
@ -59,19 +61,19 @@
          />
        </template>
      </el-table-column>
-      <el-table-column label="Action" width="200" fixed="right">
+      <el-table-column :label="$t('common:action:action')" width="200" fixed="right">
        <template slot-scope="scope">
          <el-button
            type="text"
            @click="handleEdit(scope.row)"
          >
-            编辑
+            {{ $t('common:action:edit') }}
          </el-button>
          <el-button
            type="text"
            @click="handleDelete(scope.row)"
          >
-            删除
+            {{ $t('common:button:delete') }}
          </el-button>
        </template>
      </el-table-column>
@ -115,7 +117,7 @@ export default {
    switchChange(event, item) {
      this.loading = true
      addOrUpdateBasicDic(item).then(res => {
-        this.$message.success('Saved successfully!')
+        this.$message.success(this.$t('common:message:savedSuccessfully'))
        this.loading = false
      }).catch(() => {
        this.loading = false
@ -123,12 +125,12 @@ export default {
    },
    handleEdit(row) {
      this.$nextTick(() => {
-        this.$refs['DictionaryTypeConfigForm'].openDialog('DictionaryTypeConfig', row)
+        this.$refs['DictionaryTypeConfigForm'].openDialog(this.$t('common:action:edit'), row)
      })
    },
    handleAdd() {
      this.$nextTick(() => {
-        this.$refs['DictionaryTypeConfigForm'].openDialog('DictionaryTypeConfig', {})
+        this.$refs['DictionaryTypeConfigForm'].openDialog(this.$t('common:button:new'), {})
      })
    },
    handleDelete(row) {
--- a/src/views/dictionary/template/agreement/TemplateForm.vue
+++ b/src/views/dictionary/template/agreement/TemplateForm.vue
@ -0,0 +1,194 @@
+<template>
+  <el-form ref="sysAgreementFrom" v-loading="loading" :model="form" label-width="140px" size="small" :rules="rules"
+    class="upload-temporary-file">
+    <div class="base-dialog-body">
+      <el-row>
+        <el-col :span="12">
+          <el-form-item :label="$t('dictionary:agreement:table:UserAgreementTypeEnum')" prop="UserAgreementTypeEnum"
+            style="width: 48%">
+            <el-select v-model="form.UserAgreementTypeEnum" style="width: 100%" size="small" filterable>
+              <el-option v-for="item of $d.UserAgreementType" :key="item.id" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item :label="$t('dictionary:agreement:table:FileName')" prop="FileName" style="width: 48%">
+            <el-input v-model="form.FileName" clearable style="width: 100%" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item :label="$t('dictionary:agreement:table:FileVersion')" prop="FileVersion" style="width: 48%">
+            <el-input v-model="form.FileVersion" clearable style="width: 100%" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item :label="$t('dictionary:agreement:table:UpdateDate')" prop="UpdateDate" style="width: 48%">
+            <el-date-picker v-model="form.UpdateDate" type="date"
+              :placeholder="$t('trials:seletctedReviews:table:selectionTime')" value-format="yyyy-MM-dd"
+              format="yyyy-MM-dd" clearable style="width: 100%;">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item :label="$t('dictionary:agreement:table:EffectiveDate')" prop="EffectiveDate" style="width: 48%">
+            <el-date-picker v-model="form.EffectiveDate" type="date"
+              :placeholder="$t('trials:seletctedReviews:table:selectionTime')" value-format="yyyy-MM-dd"
+              format="yyyy-MM-dd" clearable style="width: 100%;">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-form-item :label="$t('dictionary:agreement:table:FileContent')" prop="FileContent">
+        <div class="html_temp">
+          <prism-editor class="my-editor" v-model="form.FileContent" :highlight="highlighter" :line-numbers="true"
+            style="width: 50%;max-height: 350px;"></prism-editor>
+          <div v-html="form.FileContent" style="width: 45%;" class="content"></div>
+        </div>
+      </el-form-item>
+      <el-form-item :label="$t('dictionary:agreement:table:FileContentEn')" prop="FileEnContent">
+        <div class="html_temp">
+          <prism-editor class="my-editor" v-model="form.FileEnContent" :highlight="highlighter" :line-numbers="true"
+            style="width: 50%;max-height: 350px;"></prism-editor>
+          <div v-html="form.FileEnContent" style="width: 45%;" class="content"></div>
+        </div>
+      </el-form-item>
+
+    </div>
+    <div class="base-dialog-footer" style="text-align: right; margin-top: 10px">
+      <el-form-item style="text-align: right">
+        <el-button size="small" type="primary" :loading="saveBtnLoading" @click="handleSave">{{ $t('common:button:save')
+        }}</el-button>
+      </el-form-item>
+    </div>
+  </el-form>
+</template>
+<script>
+import {
+  addOrUpdateUserAgreement,
+} from '@/api/dictionary'
+
+import { PrismEditor } from 'vue-prism-editor';
+import 'vue-prism-editor/dist/prismeditor.min.css';
+import { highlight, languages } from 'prismjs/components/prism-core';
+import 'prismjs/components/prism-clike';
+import 'prismjs/components/prism-javascript';
+import 'prismjs/themes/prism.css';
+export default {
+  name: 'TemplateForm',
+  props: {
+    data: {
+      type: Object,
+      default() {
+        return {}
+      },
+    },
+  },
+  components: { PrismEditor },
+  data() {
+    return {
+      form: {
+        Id: '',
+        UserAgreementTypeEnum: '',
+        FileName: '',
+        FileVersion: null,
+        FileContent: '\n\n\n\n',
+        FileEnContent: `\n\n\n\n`,
+        UpdateDate: '',
+        EffectiveDate: '',
+        IsCurrentVersion: false
+      },
+      rules: {
+        UserAgreementTypeEnum: [
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] },
+        ],
+        FileName: [
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur'] },
+        ],
+        FileVersion: [
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur'] },
+        ],
+        FileContent: [
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur'] },
+        ],
+        FileEnContent: [
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur'] },
+        ],
+        UpdateDate: [
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] },
+        ],
+        EffectiveDate: [
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] },
+        ],
+      },
+      saveBtnLoading: false,
+      loading: false,
+      dictionaryList: {},
+    }
+  },
+  mounted() {
+    this.initForm()
+  },
+  methods: {
+    highlighter(code) {
+      return highlight(code, languages.js);
+    },
+    async initForm() {
+      if (Object.keys(this.data).length > 0) {
+        for (const k in this.form) {
+          if (this.data.hasOwnProperty(k)) {
+            this.form[k] = this.data[k]
+          }
+        }
+      }
+    },
+    handleSave() {
+      this.$refs.sysAgreementFrom.validate((valid) => {
+        if (!valid) return
+        this.saveBtnLoading = true
+        addOrUpdateUserAgreement(this.form)
+          .then((res) => {
+            this.saveBtnLoading = false
+            this.$emit('closeDialog')
+            this.$emit('getList')
+            this.$message.success(this.$t('common:message:savedSuccessfully'))
+          })
+          .catch(() => {
+            this.saveBtnLoading = false
+          })
+      })
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.html_temp {
+  display: flex;
+  justify-content: space-between;
+  width: 100%;
+
+  .my-editor {
+    border: 1px solid #333;
+  }
+
+}
+
+.base-dialog-body {
+  max-height: calc(100% - 60px);
+}
+
+.upload-temporary-file {
+  overflow-y: auto;
+  height: 100%;
+}
+
+.content {
+  max-height: 350px;
+  overflow-y: auto;
+}
+</style>
--- a/src/views/dictionary/template/agreement/index.vue
+++ b/src/views/dictionary/template/agreement/index.vue
@ -0,0 +1,313 @@
+<template>
+  <BaseContainer>
+    <template slot="search-container">
+      <el-form :inline="true" size="small">
+        <!-- 文件类型 -->
+        <el-form-item :label="$t('dictionary:agreement:table:UserAgreementTypeEnum')">
+          <el-select v-model="searchData.UserAgreementTypeEnum" style="width: 150px">
+            <el-option v-for="item of $d.UserAgreementType" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
+        </el-form-item>
+        <!-- 文件名称 -->
+        <el-form-item :label="$t('dictionary:agreement:table:FileName')">
+          <el-input v-model="searchData.FileName" style="width: 130px" clearable />
+        </el-form-item>
+        <!-- 版本 -->
+        <el-form-item :label="$t('dictionary:agreement:table:FileVersion')">
+          <el-input v-model="searchData.FileVersion" style="width: 130px" clearable />
+        </el-form-item>
+        <!--更新日期-->
+        <el-form-item :label="$t('dictionary:agreement:table:UpdateDate')">
+          <el-date-picker v-model="UpdateDate" @change="changeTimeList('UpdateDate')" value-format="yyyy-MM-dd"
+            type="daterange">
+          </el-date-picker>
+        </el-form-item>
+        <!--生效日期-->
+        <el-form-item :label="$t('dictionary:agreement:table:EffectiveDate')">
+          <el-date-picker v-model="EffectiveDate" @change="changeTimeList('EffectiveDate')" value-format="yyyy-MM-dd"
+            type="daterange">
+          </el-date-picker>
+        </el-form-item>
+        <!-- 当前版本 -->
+        <el-form-item :label="$t('dictionary:agreement:table:IsCurrentVersion')">
+          <el-select v-model="searchData.IsCurrentVersion" style="width: 150px">
+            <el-option v-for="item of $d.YesOrNo" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <!-- 查询 -->
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
+            {{ $t('common:button:search') }}
+          </el-button>
+          <!-- 重置 -->
+          <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
+            {{ $t('common:button:reset') }}
+          </el-button>
+        </el-form-item>
+        <el-button type="primary" style="float: right" size="small" @click="handleAdd">
+          {{ $t('common:button:new') }}
+        </el-button>
+      </el-form>
+    </template>
+    <template slot="main-container">
+      <el-table v-adaptive="{ bottomOffset: 60 }" v-loading="loading" :data="list" stripe height="100"
+        @sort-change="handleSortChange">
+        <el-table-column type="index" width="40" />
+        <!-- 文件类型 -->
+        <el-table-column prop="UserAgreementTypeEnum" :label="$t('dictionary:agreement:table:UserAgreementTypeEnum')"
+          show-overflow-tooltip sortable="custom">
+          <template slot-scope="scope">
+            {{
+              $fd(
+                'UserAgreementType',
+                scope.row.UserAgreementTypeEnum
+              )
+            }}
+          </template>
+        </el-table-column>
+        <!-- 文件名称 -->
+        <el-table-column prop="FileName" :label="$t('dictionary:agreement:table:FileName')" show-overflow-tooltip
+          sortable="custom" />
+        <!-- 版本 -->
+        <el-table-column prop="FileVersion" :label="$t('dictionary:agreement:table:FileVersion')" show-overflow-tooltip
+          sortable="custom" />
+        <!--内容-->
+        <el-table-column prop="FileContent" :label="$t('dictionary:agreement:table:FileContent')">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click.stop="view(scope.row)">{{ $t('dictionary:agreement:button:view')
+            }}</el-button>
+          </template>
+        </el-table-column>
+        <!-- 更新日期 -->
+        <el-table-column prop="UpdateDate" :label="$t('dictionary:agreement:table:UpdateDate')" show-overflow-tooltip
+          sortable="custom">
+          <template slot-scope="scope">
+            <span>{{ scope.row.UpdateDate ? scope.row.UpdateDate.split(' ')[0] : '' }}</span>
+          </template>
+        </el-table-column>
+        <!-- 生效日期 -->
+        <el-table-column prop="EffectiveDate" :label="$t('dictionary:agreement:table:EffectiveDate')"
+          show-overflow-tooltip sortable="custom">
+          <template slot-scope="scope">
+            <span>{{ scope.row.EffectiveDate ? scope.row.EffectiveDate.split(' ')[0] : '' }}</span>
+          </template>
+        </el-table-column>
+        <!-- 当前版本 -->
+        <el-table-column prop="IsCurrentVersion" :label="$t('dictionary:agreement:table:IsCurrentVersion')"
+          show-overflow-tooltip sortable="custom">
+          <template slot-scope="scope">
+            {{
+              $fd(
+                'YesOrNo',
+                scope.row.IsCurrentVersion
+              )
+            }}
+          </template>
+        </el-table-column>
+        <!-- 创建日期 -->
+        <el-table-column prop="CreateTime" :label="$t('dictionary:agreement:table:CreateTime')" show-overflow-tooltip
+          sortable="custom" />
+        <!-- 修改日期 -->
+        <el-table-column prop="UpdateTime" :label="$t('dictionary:agreement:table:UpdateTime')" show-overflow-tooltip
+          sortable="custom" />
+
+        <el-table-column :label="$t('common:action:action')" width="300">
+          <template slot-scope="scope">
+            <el-button type="text" :disabled="scope.row.IsCurrentVersion" @click="setCurrentVersion(scope.row)">
+              {{ $t('dictionary:agreement:button:setCurrentVersion') }}
+            </el-button>
+            <el-button type="text" @click="handleEdit(scope.row)">
+              {{ $t('common:button:edit') }}
+            </el-button>
+            <!-- <el-button type="text" @click="handleDelete(scope.row)">
+              {{ $t('common:button:delete') }}
+            </el-button> -->
+          </template>
+        </el-table-column>
+      </el-table>
+      <!-- 分页组件 -->
+      <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
+        @pagination="getList" />
+
+      <!-- 新增/编辑 -->
+      <el-dialog v-if="editDialog.visible" :visible.sync="editDialog.visible" :close-on-click-modal="false"
+        :title="editDialog.title" custom-class="base-dialog-wrapper" :fullscreen="true">
+        <TemplateForm :data="currentRow" @closeDialog="closeDialog" @getList="getList" />
+      </el-dialog>
+    </template>
+  </BaseContainer>
+</template>
+<script>
+import {
+  getUserAgreementList,
+  deleteUserAgreement,
+  setCurrentVersion
+} from '@/api/dictionary'
+import BaseContainer from '@/components/BaseContainer'
+import Pagination from '@/components/Pagination'
+import TemplateForm from './TemplateForm'
+const searchDataDefault = () => {
+  return {
+    StartEffectiveDate: null,
+    EndEffectiveDate: null,
+    FileName: null,
+    FileVersion: null,
+    IsCurrentVersion: null,
+    StartUpdateDate: null,
+    EndUpdateDate: null,
+    UserAgreementTypeEnum: null,
+    Asc: false,
+    SortField: "",
+    PageIndex: 1,
+    PageSize: 20,
+  }
+}
+export default {
+  name: 'Agreement',
+  components: { BaseContainer, Pagination, TemplateForm },
+  data() {
+    return {
+      searchData: searchDataDefault(),
+      list: [],
+      total: 0,
+      currentRow: {},
+      editDialog: { title: '', visible: false },
+      loading: false,
+      UpdateDate: [],
+      EffectiveDate: []
+    }
+  },
+  mounted() {
+    this.getList()
+  },
+  computed: {
+    isEN() {
+      return this.$i18n.locale !== 'zh'
+    },
+  },
+  methods: {
+    async setCurrentVersion(row) {
+      try {
+        let data = {
+          Id: row.Id
+        }
+        this.loading = true
+        let res = await setCurrentVersion(data)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.getList()
+        }
+      } catch (err) {
+        this.loading = false
+        console.log(err)
+      }
+    },
+    view(row) {
+      this.$AGR({
+        Id: row.Id,
+        IsEn_Us: this.isEN
+      })
+    },
+    changeTimeList(key) {
+      if (this[key]) {
+        this.searchData[`Start${key}`] = this[key][0]
+        this.searchData[`End${key}`] = this[key][1]
+      } else {
+        this.searchData.BeginCreateTime = null
+        this.searchData.EndCreateTime = null
+      }
+    },
+    handleDelete(row) {
+      // 确定删除该模版？
+      this.$confirm(this.$t('dictionary:agreement:message:msg1')).then(() => {
+        deleteUserAgreement(row.Id).then(() => {
+          this.$message.success(this.$t('common:message:deletedSuccessfully'))
+          this.getList()
+        })
+      }).catch(() => { })
+    },
+    PreviewFile(row) {
+      let basePath = window.location.origin
+      if (window.location.protocol !== 'https:') {
+        basePath = 'https://irc.test.extimaging.com'
+      }
+      let data = {
+        name: row.NameCN,
+        path: basePath + row.Path,
+      }
+      this.$emit('PreviewFile', data)
+    },
+    getList() {
+      this.loading = true
+      getUserAgreementList(this.searchData)
+        .then((res) => {
+          this.loading = false
+          this.list = res.Result.CurrentPageData
+          this.total = res.Result.TotalCount
+        })
+        .catch(() => {
+          this.loading = false
+        })
+    },
+    // 新增
+    handleAdd() {
+      this.editDialog.title = this.$t('common:button:new')
+      this.currentRow = {}
+      this.editDialog.visible = true
+    },
+    // 下载
+    async handleDownload(row) {
+      try {
+        this.loading = true
+        let fileName = this.isEN ? row.Name : row.NameCN;
+        let type = fileName
+          .substring(fileName.lastIndexOf('.'))
+          .toLocaleLowerCase()
+        if (!type) {
+          let extendName = row.Path
+            .substring(row.Path.lastIndexOf('.'))
+            .toLocaleLowerCase()
+          fileName += extendName
+        }
+        let res = await downLoadFile(this.OSSclientConfig.basePath + row.Path, fileName)
+        this.loading = false
+      } catch (err) {
+        this.loading = false
+      }
+    },
+    // 编辑
+    handleEdit(row) {
+      this.editDialog.title = this.$t('common:button:edit')
+      this.currentRow = { ...row }
+      this.editDialog.visible = true
+    },
+    handleSearch() {
+      this.searchData.PageIndex = 1
+      this.getList()
+    },
+    handleReset() {
+      this.searchData = searchDataDefault()
+      this.getList()
+    },
+    closeDialog() {
+      this.editDialog.visible = false
+    },
+    // 排序
+    handleSortChange(column) {
+      if (column.order === 'ascending') {
+        this.searchData.Asc = true
+      } else {
+        this.searchData.Asc = false
+      }
+      this.searchData.SortField = column.prop
+      this.searchData.PageIndex = 1
+      this.getList()
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+::v-deep .search {
+  display: block;
+}
+</style>
--- a/src/views/dictionary/template/browser/tip.vue
+++ b/src/views/dictionary/template/browser/tip.vue
@ -6,12 +6,13 @@
 </template>
 <script>
 import { getExploreRecommentInfo } from "@/api/dictionary";
+import SystemInfo from "@/utils/systemInfo";
 export default {
  name: "browserTip",
  data() {
    return {
      form: {},
-      tip: this.$t("browser:tip:changeBorwser"),
+      tip: '',
      visible: false,
    };
  },
@ -36,6 +37,7 @@ export default {
        // console.log(type, No);
        if (type !== "Chrome" && type !== "Edge") {
          this.tip = this.$t("browser:tip:changeBorwser");
+          this.getSystemInfo()
          return (this.visible = true);
        }
        let res = await this.getInfo();
@ -51,12 +53,30 @@ export default {
              this.tip += "、";
            }
          });
+          this.getSystemInfo()
          return (this.visible = true);
        }
+        this.getSystemInfo()
      } catch (err) {
        console.log(err);
      }
    },
+    getSystemInfo() {
+      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) {
+        if (this.tip) {
+          this.tip += `<br/>`
+        }
+        this.tip += `<span>${this.$t("browser:tip:Configuration")}</span>`
+        this.visible = true
+      }
+    },
    getExplore() {
      var Sys = {};
      var ua = navigator.userAgent.toLowerCase();
@ -100,6 +120,7 @@ export default {
  align-items: center;
  padding: 0 20px;
  color: #555;
+
  i {
    color: red;
    font-size: 24px;
--- a/src/views/dictionary/template/components/CriterionQuestionForm.vue
+++ b/src/views/dictionary/template/components/CriterionQuestionForm.vue
--- a/src/views/dictionary/template/components/CriterionsBaseData.vue
+++ b/src/views/dictionary/template/components/CriterionsBaseData.vue
@ -3,27 +3,22 @@
    <!-- 器官 -->
    <el-tab-pane :label="$t('dictionary:template:basicData:organs')" name="organs">

-      <OrgansTbl
-        :criterion-id="criterionId"
-        :is-complete-config="isCompleteConfig"
-      />
+      <OrgansTbl :criterion-id="criterionId" :is-complete-config="isCompleteConfig" />
    </el-tab-pane>
    <!-- 疗效评估 -->
    <el-tab-pane :label="$t('dictionary:template:basicData:efficacyAssessment')" name="efficacyAssessment">
-      <EfficacyAssessment
-        v-if="tabs.includes('efficacyAssessment')"
-        :criterion-id="criterionId"
-        :criterion-type="criterionType"
-        :is-complete-config="isCompleteConfig"
-      />
+      <EfficacyAssessment v-if="tabs.includes('efficacyAssessment')" :criterion-id="criterionId"
+        :criterion-type="criterionType" :is-complete-config="isCompleteConfig" />
    </el-tab-pane>
    <!-- 标准字典 -->
    <el-tab-pane :label="$t('dictionary:template:basicData:criterionDictionary')" name="criterionDictionary">
-      <CriterionDictionary
-        v-if="tabs.includes('criterionDictionary')"
-        :criterion-id="criterionId"
-        :is-complete-config="isCompleteConfig"
-      />
+      <CriterionDictionary v-if="tabs.includes('criterionDictionary')" :criterion-id="criterionId"
+        :is-complete-config="isCompleteConfig" />
+    </el-tab-pane>
+    <!-- 关键文件 -->
+    <el-tab-pane :label="$t('dictionary:template:basicData:keyDocument')" name="keyDocument">
+      <KeyDocument v-if="tabs.includes('keyDocument')" :criterion-id="criterionId"
+        :is-complete-config="isCompleteConfig" />
    </el-tab-pane>
  </el-tabs>
 </template>
@ -31,9 +26,10 @@
 import OrgansTbl from './OrgansTbl'
 import EfficacyAssessment from './EfficacyAssessment'
 import CriterionDictionary from './CriterionDictionary'
+import KeyDocument from './KeyDocument'
 export default {
  name: 'CriterionsBaseData',
-  components: { OrgansTbl, EfficacyAssessment, CriterionDictionary },
+  components: { OrgansTbl, EfficacyAssessment, CriterionDictionary, KeyDocument },
  props: {
    criterionId: {
      type: String,
--- a/src/views/dictionary/template/components/EvaluationOfGlobalConfig.vue
+++ b/src/views/dictionary/template/components/EvaluationOfGlobalConfig.vue
@ -8,13 +8,8 @@
        {{ $fd('YesOrNo', IsMustGlobalReading) }}
      </el-form-item>
      <!-- 配置 -->
-      <el-button
-        size="mini"
-        type="primary"
-        style="position: absolute;right: 10px;top: 15px"
-        v-if="Object.keys(data).length > 0 && !(data.IsCompleteConfig || data.IsBeUsed)"
-        @click="handleAdd(1)"
-      >
+      <el-button size="mini" type="primary" style="position: absolute;right: 10px;top: 15px"
+        v-if="Object.keys(data).length > 0 && !(data.IsCompleteConfig || data.IsBeUsed)" @click="handleAdd(1)">
        {{ $t('dictionary:template:globalConfig:config') }}
      </el-button>
    </el-form>
@ -22,54 +17,29 @@
      <!-- 名称 -->
      <el-divider content-position="left">{{ $t('dictionary:template:globalConfig:name') }}</el-divider>
      <!-- 配置 -->
-      <el-button
-        size="mini"
-        type="primary"
-        style="position: absolute;right: 10px;top: 15px"
-        v-if="Object.keys(data).length > 0 && !(data.IsCompleteConfig || data.IsBeUsed)"
-        @click="handleAdd(2)"
-      >
+      <el-button size="mini" type="primary" style="position: absolute;right: 10px;top: 15px"
+        v-if="Object.keys(data).length > 0 && !(data.IsCompleteConfig || data.IsBeUsed)" @click="handleAdd(2)">
        {{ $t('dictionary:template:globalConfig:config') }}
      </el-button>
      <!-- 评估更新类型 -->
      <el-form-item :label="$t('dictionary:template:globalConfig:updateType')" style="width: 100%">
      </el-form-item>
-      <el-table
-        v-loading="loading"
-        style="width: 100%"
-        :data="list"
-        stripe
-      >
+      <el-table v-loading="loading" style="width: 100%" :data="list" stripe>
        <!-- 序号 -->
-        <el-table-column
-          prop=""
-          :label="$t('dictionary:template:globalConfig:order')"
-          width="80"
-        >
+        <el-table-column prop="" :label="$t('dictionary:template:globalConfig:order')" width="80">
          <template slot-scope="scope">
-            {{scope.$index + 1}}
+            {{ scope.$index + 1 }}
          </template>
        </el-table-column>
        <!-- 中文值 -->
-        <el-table-column
-          prop="ValueCN"
-          :label="$t('dictionary:template:globalConfig:valueCN')"
-          show-overflow-tooltip
-        >
+        <el-table-column prop="ValueCN" :label="$t('dictionary:template:globalConfig:valueCN')" show-overflow-tooltip>
        </el-table-column>
        <!-- 英文值 -->
-        <el-table-column
-          prop="Value"
-          :label="$t('dictionary:template:globalConfig:value')"
-          show-overflow-tooltip
-        >
+        <el-table-column prop="Value" :label="$t('dictionary:template:globalConfig:value')" show-overflow-tooltip>
        </el-table-column>
        <!-- 是否基线评估 -->
-        <el-table-column
-          prop="IsBaseLineUse"
-          :label="$t('dictionary:template:globalConfig:isBaseLineUse')"
-          show-overflow-tooltip
-        >
+        <el-table-column prop="IsBaseLineUse" :label="$t('dictionary:template:globalConfig:isBaseLineUse')"
+          show-overflow-tooltip>
          <template slot-scope="scope">
            <!--              <el-switch-->
            <!--                @change="(v) => {BaseLineUseChange(v, scope.row)}"-->
@ -81,92 +51,64 @@
          </template>
        </el-table-column>
        <!-- 是否随访评估 -->
-        <el-table-column
-          prop="IsFollowVisitUse"
-          :label="$t('dictionary:template:globalConfig:isFollowVisitUse')"
-          show-overflow-tooltip
-        >
+        <el-table-column prop="IsFollowVisitUse" :label="$t('dictionary:template:globalConfig:isFollowVisitUse')"
+          show-overflow-tooltip>
          <template slot-scope="scope">
            <!--              <el-switch-->
            <!--                @change="(v) => {FollowVisitUseChange(v, scope.row)}"-->
            <!--                v-model="scope.row.IsFollowVisitUse"-->
            <!--              >-->
            <!--              </el-switch>-->
-            <el-tag v-if="scope.row.IsFollowVisitUse" type="primary">{{ $fd('YesOrNo', scope.row.IsFollowVisitUse) }}</el-tag>
+            <el-tag v-if="scope.row.IsFollowVisitUse" type="primary">{{ $fd('YesOrNo', scope.row.IsFollowVisitUse)
+            }}</el-tag>
            <el-tag v-else type="danger">{{ $fd('YesOrNo', scope.row.IsFollowVisitUse) }}</el-tag>
            <!--              <span>{{$fd('YesOrNo', scope.row.IsFollowVisitUse)}}</span>-->
          </template>
        </el-table-column>
      </el-table>
    </el-form>
-    <base-model
-      :config="config"
-    >
+    <base-model :config="config">
      <template slot="dialog-body">
        <el-form size="small" :inline="true" label-width="130px">
          <!-- 是否必须全局阅片 -->
-          <el-form-item :label="$t('dictionary:template:globalConfig:isMustGlobalReading')" v-if="config.configType === 1">
+          <el-form-item :label="$t('dictionary:template:globalConfig:isMustGlobalReading')"
+            v-if="config.configType === 1">
            <el-radio-group v-model="form.IsMustGlobalReading">
-              <el-radio v-for="item of $d.YesOrNo" :key="'form.IsMustGlobalReading' + item.value" :label="item.value">{{ item.label }}</el-radio>
+              <el-radio v-for="item of $d.YesOrNo" :key="'form.IsMustGlobalReading' + item.value" :label="item.value">{{
+                item.label }}</el-radio>
            </el-radio-group>
          </el-form-item>
-          <!-- 评估更新类型 -->
-          <el-form-item v-if="config.configType === 2" :label="$t('dictionary:template:globalConfig:updateType')" style="width: 100%">
+          <!-- 评估更新类型 @selection-change="handleSelectionChange"-->
+          <el-form-item v-if="config.configType === 2" :label="$t('dictionary:template:globalConfig:updateType')"
+            style="width: 100%">
          </el-form-item>
-          <el-table
-            v-if="config.configType === 2"
-            v-loading="loading"
-            ref="multipleTable"
-            :data="GlobalAssessType"
-            stripe
-            @selection-change="handleSelectionChange"
-          >
-            <el-table-column
-              type="selection"
-              width="55">
-            </el-table-column>
+          <el-table v-if="config.configType === 2" v-loading="loading" ref="multipleTable" :data="GlobalAssessType"
+            stripe>
+            <!-- <el-table-column type="selection" width="55">
+            </el-table-column> -->
            <!-- 中文值 -->
-            <el-table-column
-              prop="ValueCN"
-              :label="$t('dictionary:template:globalConfig:valueCN')"
-              show-overflow-tooltip
-            >
+            <el-table-column prop="ValueCN" :label="$t('dictionary:template:globalConfig:valueCN')"
+              show-overflow-tooltip>
            </el-table-column>
            <!-- 英文值 -->
-            <el-table-column
-              prop="Value"
-              :label="$t('dictionary:template:globalConfig:value')"
-              show-overflow-tooltip
-            >
+            <el-table-column prop="Value" :label="$t('dictionary:template:globalConfig:value')" show-overflow-tooltip>
            </el-table-column>
            <!-- 是否基线评估 -->
-            <el-table-column
-              prop="IsBaseLineUse"
-              :label="$t('dictionary:template:globalConfig:isBaseLineUse')"
-              show-overflow-tooltip
-            >
+            <el-table-column prop="IsBaseLineUse" :label="$t('dictionary:template:globalConfig:isBaseLineUse')"
+              show-overflow-tooltip>
              <template slot-scope="scope">
-                <el-switch
-                  v-model="scope.row.IsBaseLineUse"
-                  @change="() => $forceUpdate()"
-                >
+                <el-switch v-model="scope.row.IsBaseLineUse" @change="() => $forceUpdate()">
                </el-switch>
-                <span>{{$fd('YesOrNo', scope.row.IsBaseLineUse)}}</span>
+                <span>{{ $fd('YesOrNo', scope.row.IsBaseLineUse) }}</span>
              </template>
            </el-table-column>
            <!-- 是否随访评估 -->
-            <el-table-column
-              prop="IsFollowVisitUse"
-              :label="$t('dictionary:template:globalConfig:isFollowVisitUse')"
-              show-overflow-tooltip
-            >
+            <el-table-column prop="IsFollowVisitUse" :label="$t('dictionary:template:globalConfig:isFollowVisitUse')"
+              show-overflow-tooltip>
              <template slot-scope="scope">
-                <el-switch
-                  v-model="scope.row.IsFollowVisitUse"
-                  @change="() => $forceUpdate()"
-                >
+                <el-switch v-model="scope.row.IsFollowVisitUse" @change="() => $forceUpdate()">
                </el-switch>
-                <span>{{$fd('YesOrNo', scope.row.IsFollowVisitUse)}}</span>
+                <span>{{ $fd('YesOrNo', scope.row.IsFollowVisitUse) }}</span>
              </template>
            </el-table-column>
          </el-table>
@ -226,7 +168,7 @@ export default {
  mounted() {
    this.getList()
    this.getSystemGlobalInfo()
-    this.getCriterionDictionary()
+    // this.getCriterionDictionary()
  },
  methods: {
    getCriterionDictionary() {
@ -241,12 +183,12 @@ export default {
      getSystemGlobalInfo({
        SystemCriterionId: this.criterionId
      }).then(res => {
-
+        this.GlobalAssessType = res.Result.DictionaryList
      })
    },
    FollowVisitUseChange(v, row) {
      this.loading = true
-      setDictionaryFollowVisitUse({Id:row.Id, IsFollowVisitUse: v}).then(res => {
+      setDictionaryFollowVisitUse({ Id: row.Id, IsFollowVisitUse: v }).then(res => {
        this.$message.success(this.$t('common:message:savedSuccessfully'))
        this.loading = false
      }).catch(() => {
@ -255,7 +197,7 @@ export default {
    },
    BaseLineUseChange(v, row) {
      this.loading = true
-      setDictionaryBaseLineUse({Id:row.Id, isBaseLineUse: v}).then(res => {
+      setDictionaryBaseLineUse({ Id: row.Id, isBaseLineUse: v }).then(res => {
        this.$message.success(this.$t('common:message:savedSuccessfully'))
        this.loading = false
      }).catch(() => {
@ -273,6 +215,7 @@ export default {
      }
    },
    handleSelectionChange(val) {
+      console.log(this.selectedList, 'this.selectedList')
      this.selectedList = val
    },
    getList() {
@ -295,18 +238,6 @@ export default {
      } else {
        this.config.title = this.$t('dictionary:template:globalConfig:updateType')
        this.config.visible = true
-        this.$nextTick(() => {
-          var a = this.$d.GlobalAssessType.filter(v => {
-            return !!this.list.find(v1 => {
-              if (v.id === v1.DictionaryId) {
-                v.IsBaseLineUse = v1.IsBaseLineUse
-                v.IsFollowVisitUse = v1.IsFollowVisitUse
-              }
-              return v1.DictionaryId === v.id
-            })
-          })
-          this.toggleSelection(a)
-        })
      }
    },
    handleSave() {
@ -319,11 +250,11 @@ export default {
      var params = {
        SystemCriterionId: this.criterionId,
        IsMustGlobalReading: this.form.IsMustGlobalReading,
-        DictionaryList: this.config.configType === 1 ? this.list : this.selectedList.map(v => {
+        DictionaryList: this.config.configType === 1 ? this.list : this.GlobalAssessType.map(v => {
          return {
-            DictionaryId: v.id,
-            IsBaseLineUse: v.IsBaseLineUse,
-            IsFollowVisitUse: v.IsFollowVisitUse,
+            DictionaryId: v.DictionaryId,
+            IsBaseLineUse: v.IsBaseLineUse ? v.IsBaseLineUse : false,
+            IsFollowVisitUse: v.IsFollowVisitUse ? v.IsFollowVisitUse : false,
          }
        }),
      }
@ -342,5 +273,3 @@ export default {
  }
 }
 </script>
-
-
--- a/src/views/dictionary/template/components/KeyDocument.vue
+++ b/src/views/dictionary/template/components/KeyDocument.vue
@ -0,0 +1,286 @@
+<template>
+    <BaseContainer>
+        <!-- 搜索框 -->
+        <template slot="search-container">
+            <el-form :inline="true" size="mini">
+                <el-form-item :label="$t('dictionary:template:keyDocList:FileName')">
+                    <el-input clearable v-model="searchData.FileName"></el-input>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" icon="el-icon-search" size="mini" @click="handleSearch">
+                        {{ $t('common:button:search') }}
+                    </el-button>
+                    <el-button type="primary" icon="el-icon-refresh-left" size="mini" @click="handleReset">
+                        {{ $t('common:button:reset') }}
+                    </el-button>
+                </el-form-item>
+                <el-form-item>
+                    <div class="upload">
+                        <input directory accept=".pdf" type="file" name="uploadFolder" class="select-file" title=""
+                            @change="beginScanFiles($event)" />
+                        <div class="btn-select">
+                            {{ $t('dictionary:template:basicData:button:selectFile') }}
+                        </div>
+                    </div>
+                </el-form-item>
+            </el-form>
+        </template>
+
+        <template slot="main-container">
+            <div class="drag" ref="drag" @dragover="handleDragover" @drop="handleDrop">
+                <el-table ref="keyDocList" v-loading="loading" v-adaptive="{ bottomOffset: 80 }" :data="list"
+                    width="100%" style="width: 100%;min-width: 300px" stripe height="100"
+                    @sort-change="handleSortByColumn">
+                    <el-table-column type="index" min-width="90" />
+                    <el-table-column prop="FileName" :label="$t('dictionary:template:keyDocList:FileName')"
+                        show-overflow-tooltip />
+                    <el-table-column prop="CreateTime" :label="$t('dictionary:template:keyDocList:CreateTime')"
+                        show-overflow-tooltip />
+                    <el-table-column :label="$t('common:action:action')" align="left" fixed="right">
+                        <template slot-scope="scope">
+                            <el-button circle icon="el-icon-view"
+                                :title="$t('dictionary:template:keyDocList:button:view')"
+                                @click.stop="view(scope.row)" />
+                            <el-button circle icon="el-icon-delete"
+                                :title="$t('dictionary:template:keyDocList:button:del')" @click.stop="del(scope.row)" />
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+
+            <!-- 分页组件 -->
+            <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
+                @pagination="getList" />
+        </template>
+
+    </BaseContainer>
+</template>
+<script>
+import { Upload } from '@/api/dictionary'
+import BaseContainer from '@/components/BaseContainer'
+import Pagination from '@/components/Pagination'
+import { getSystemCriterionKeyFileList, addOrUpdateSystemCriterionKeyFile, deleteSystemCriterionKeyFile } from '@/api/dictionary'
+import { readEntry } from '@/utils/index'
+const searchDataDefault = () => {
+    return {
+        FileName: '',
+        PageIndex: 1,
+        PageSize: 20,
+        Asc: false,
+        SortField: ''
+    }
+}
+export default {
+    name: "KeyDocument",
+    components: { BaseContainer, Pagination },
+    props: {
+        criterionId: {
+            type: String,
+            required: true
+        },
+        isCompleteConfig: {
+            type: Boolean,
+            required: true
+        },
+    },
+    data() {
+        return {
+            searchData: searchDataDefault(),
+            loading: false,
+            list: [],
+            total: 0,
+        }
+    },
+    mounted() {
+        this.getList()
+    },
+    methods: {
+        handleDragover(e) {
+            e.stopPropagation();
+            e.preventDefault();
+        },
+        handleDrop(e) {
+            e.stopPropagation();
+            e.preventDefault();
+            this.beginScanFiles(e, true)
+        },
+        beforeUpload(file) {
+            // 检测文件类型是否符合要求
+            if (this.checkFileSuffix(file.name)) {
+                this.fileList = [];
+                return true;
+            } else {
+                // this.$alert("必须是word/excel格式");
+                this.$alert(this.$t("dictionary:attachment:export:alert:formatFile"));
+                return false;
+            }
+        },
+        async beginScanFiles(e, isDrop = false) {
+            try {
+                this.loading = true;
+                let files = []
+                if (isDrop) {
+                    const items = e.dataTransfer.items;
+                    const allFiles = []; // 用于存储所有找到的文件
+
+                    // 遍历拖拽项
+                    for (const item of items) {
+                        const entry = item.webkitGetAsEntry(); // 获取文件系统入口
+                        if (entry) {
+                            const files = await readEntry(entry); // 递归读取入口内容
+                            allFiles.push(...files);
+                        }
+                    }
+                    files = allFiles
+                } else {
+                    files = [...e.target.files]
+                }
+                for (let i = 0; i < files.length; i++) {
+                    let file = files[i]
+                    if (!this.checkFileSuffix(file.name)) continue
+                    const formData = new FormData();
+                    formData.append("file", file);
+                    let res = await Upload(formData, 5)
+                    let data = {
+                        FilePath: res.Result.FilePath,
+                        FileName: file.name
+                    }
+                    await this.addKeyDoc(data)
+
+                }
+            } catch (err) {
+                console.log(err)
+                this.loading = false;
+            }
+        },
+        checkFileSuffix(fileName) {
+            var index = fileName.lastIndexOf('.')
+            var suffix = fileName.substring(index + 1, fileName.length)
+            if ('.pdf'.toLocaleLowerCase().search(suffix.toLocaleLowerCase()) === -1) {
+                return false
+            } else {
+                return true
+            }
+        },
+        async getList() {
+            try {
+                this.searchData.SystemCriterionId = this.criterionId
+                this.loading = true
+                let res = await getSystemCriterionKeyFileList(this.searchData)
+                this.loading = false
+                if (res.IsSuccess) {
+                    this.list = res.Result.CurrentPageData
+                    this.total = res.Result.TotalCount
+                }
+            } catch (err) {
+                this.loading = false
+                console.log(err)
+            }
+        },
+        async addKeyDoc(row) {
+            try {
+                let { FileName, FilePath } = row
+                let data = {
+                    FileName,
+                    FilePath,
+                    SystemCriterionId: this.criterionId
+                }
+                this.loading = true
+                let res = await addOrUpdateSystemCriterionKeyFile(data)
+                this.loading = false
+                if (res.IsSuccess) {
+                    this.getList()
+                }
+            } catch (err) {
+                this.loading = false
+                console.log(err)
+            }
+        },
+        async del(row) {
+            try {
+                this.loading = true
+                let res = await deleteSystemCriterionKeyFile(row.Id)
+                this.loading = false
+                if (res.IsSuccess) {
+                    this.getList()
+                }
+            } catch (err) {
+                console.log(err)
+                this.loading = false
+            }
+        },
+        view(row) {
+            this.$preview({
+                path: row.FilePath,
+                type: 'pdf',
+                isLocal: true,
+                title: row.FileName,
+            })
+        },
+        // 查询
+        handleSearch() {
+            this.searchData.PageIndex = 1
+            this.getList()
+        },
+        // 重置
+        handleReset() {
+            this.searchData = searchDataDefault()
+            this.getList()
+        },
+        // 排序
+        handleSortByColumn(column) {
+            if (column.order === 'ascending') {
+                this.searchData.Asc = true
+            } else {
+                this.searchData.Asc = false
+            }
+            this.searchData.SortField = column.prop
+            this.searchData.PageIndex = 1
+            this.getList()
+        }
+    }
+}
+</script>
+<style lang="scss" scoped>
+.upload {
+    display: inline-block;
+    height: 30px;
+    width: 90px;
+    padding: 2px 10px;
+    line-height: 23px;
+    position: relative;
+    text-decoration: none;
+    border-radius: 3px;
+    overflow: hidden;
+    text-align: center;
+    background: #428bca;
+    border-color: #428bca;
+    color: #fff;
+
+    .select-file {
+        height: 30px;
+        width: 90px;
+        position: absolute;
+        overflow: hidden;
+        left: 0;
+        top: 0;
+        opacity: 0;
+        font-size: 0;
+    }
+
+    .btn-select {
+        //给显示在页面上的按钮写样式
+        width: 90px;
+        height: 30px;
+        line-height: 30px;
+        text-align: center;
+        cursor: pointer;
+        border-radius: 24px;
+        overflow: hidden;
+        position: absolute;
+        top: 0;
+        left: 0;
+        pointer-events: none; //pointer-events:none用来控制该标签的点击穿透事件
+    }
+}
+</style>
--- a/src/views/dictionary/template/components/TableQsForm.vue
+++ b/src/views/dictionary/template/components/TableQsForm.vue
@ -1,155 +1,86 @@
 <template>
-  <el-form
-    ref="tableQsForm"
-    v-loading="loading"
-    :model="form"
-    size="small"
-    :disabled="type === 'look'"
-    :rules="rules"
-    label-width="130px"
-  >
+  <el-form ref="tableQsForm" v-loading="loading" :model="form" size="small" :disabled="type === 'look'" :rules="rules"
+    label-width="130px">
    <div class="base-dialog-body" style="height: 550px; display:flex;flex-direction: column;">
      <div style="height: 150px;">
        <!-- 类型 -->
        <el-form-item :label="$t('trials:readingUnit:qsList:title:type')" prop="Type">
-          <el-select
-            v-model="form.Type"
-            @change="((val)=>{qsTypeChange(val, form)})"
-          >
-            <el-option
-              v-for="item of $d.Criterion_Question_Type"
+          <el-select v-model="form.Type" @change="((val) => { qsTypeChange(val, form) })">
+            <el-option v-for="item of $d.Criterion_Question_Type"
              v-show="item.value !== 'class' && item.value !== 'group' && item.value !== 'table' && item.value !== 'basicTable'"
-              :key="item.value"
-              :value="item.value"
-              :label="item.label"
-            />
+              :key="item.value" :value="item.value" :label="item.label" />
          </el-select>
        </el-form-item>
        <!-- 问题名称 -->
-        <el-form-item
-          v-if="form.Type !== 'group'"
-          :label="$t('trials:readingUnit:qsList:title:qsNameEn')"
-          prop="QuestionName"
-          :rules="[
+        <el-form-item v-if="form.Type !== 'group'" :label="$t('trials:readingUnit:qsList:title:qsNameEn')"
+          prop="QuestionName" :rules="[
            { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
            { max: form.Type === 'summary' ? 300 : 100, message: `${this.$t('common:ruleMessage:maxLength')} ${form.Type === 'summary' ? 300 : 100}` }
-          ]"
-        >
-          <el-input
-            v-model="form.QuestionName"
-          />
+          ]">
+          <el-input v-model="form.QuestionName" />
        </el-form-item>
        <!-- 问题名称（EN） -->
-        <el-form-item
-          v-if="form.Type !== 'group'"
-          :label="$t('trials:readingUnit:qsList:title:qsNameEn')"
-          prop="QuestionEnName"
-          :rules="[
+        <el-form-item v-if="form.Type !== 'group'" :label="$t('trials:readingUnit:qsList:title:qsNameEn')"
+          prop="QuestionEnName" :rules="[
            { max: form.Type === 'summary' ? 300 : 100, message: `${this.$t('common:ruleMessage:maxLength')} ${form.Type === 'summary' ? 300 : 100}` }
-          ]"
-        >
-          <el-input
-            v-model="form.QuestionEnName"
-          />
+          ]">
+          <el-input v-model="form.QuestionEnName" />
        </el-form-item>
      </div>
      <div style="flex: 1;overflow-y:auto;">
        <!-- 公有属性 -->
-        <el-divider content-position="left">{{$t('trials:readingUnit:title:publicProperties')}}</el-divider>
+        <el-divider content-position="left">{{ $t('trials:readingUnit:title:publicProperties') }}</el-divider>
        <!-- 是否显示 -->
-        <el-form-item v-if="form.Type !== 'group'" :label="$t('trials:readingUnit:qsList:title:isShow')" prop="ShowQuestion">
-          <el-radio-group
-            v-model="form.ShowQuestion"
-            @change="((val)=>{isShowQuestionChange(val, form)})"
-          >
-            <el-radio
-              v-for="item of $d.ShowQuestion"
-              :key="`ShowQuestion${item.value}`"
-              :label="item.value"
-            >
+        <el-form-item v-if="form.Type !== 'group'" :label="$t('trials:readingUnit:qsList:title:isShow')"
+          prop="ShowQuestion">
+          <el-radio-group v-model="form.ShowQuestion" @change="((val) => { isShowQuestionChange(val, form) })">
+            <el-radio v-for="item of $d.ShowQuestion" :key="`ShowQuestion${item.value}`" :label="item.value">
              {{ item.label }}
            </el-radio>
          </el-radio-group>
        </el-form-item>

        <!-- 显示时依赖父问题 -->
-        <el-form-item
-          v-if="form.Type !== 'group' && form.ShowQuestion===1"
-          :label="$t('trials:readingUnit:qsList:title:parentId')"
-          prop="ParentId"
-        >
-          <el-select
-            v-model="form.ParentId"
-            clearable
-            @change="((val)=>{parentQuestionChange(val, form)})"
-          >
-            <el-option
-              v-for="item of parentOptions"
-              :key="`ParentId${item.QuestionId}`"
-              :label="item.QuestionName"
-              :value="item.QuestionId"
-            />
+        <el-form-item v-if="form.Type !== 'group' && form.ShowQuestion === 1"
+          :label="$t('trials:readingUnit:qsList:title:parentId')" prop="ParentId">
+          <el-select v-model="form.ParentId" clearable @change="((val) => { parentQuestionChange(val, form) })">
+            <el-option v-for="item of parentOptions" :key="`ParentId${item.QuestionId}`" :label="item.QuestionName"
+              :value="item.QuestionId" />
          </el-select>
        </el-form-item>
        <!-- 显示时依赖父问题触发值 -->
-        <el-form-item v-if="form.ParentId && form.ShowQuestion===1" :label="$t('trials:readingUnit:qsList:title:parentTriggerValueList')"  prop="ParentTriggerValueList">
+        <el-form-item v-if="form.ParentId && form.ShowQuestion === 1"
+          :label="$t('trials:readingUnit:qsList:title:parentTriggerValueList')" prop="ParentTriggerValueList">
          <el-select v-model="form.ParentTriggerValueList" clearable multiple>
-            <el-option
-              v-for="item of parentTriggerValOptions"
-              :key="item.id"
-              :label="item.label"
-              :value="String(item.value)"
-            />
+            <el-option v-for="item of parentTriggerValOptions" :key="item.id" :label="item.label"
+              :value="String(item.value)" />
          </el-select>
        </el-form-item>
        <!-- 是否必填 -->
-        <el-form-item v-if="form.Type !== 'group' && form.Type !== 'table' && form.Type !== 'basicTable' && form.Type !== 'summary'" :label="$t('trials:readingUnit:qsList:title:isRequired')" prop="IsRequired">
-          <el-radio-group
-            v-model="form.IsRequired"
-            :disabled="form.IsJudgeQuestion===true || form.ShowQuestion===2"
-            @change="((val)=>{isRequiredChange(val, form)})"
-          >
-            <el-radio
-              v-for="item of $d.QuestionRequired"
-              :key="`QuestionRequired${item.value}`"
-              :label="item.value"
-            >
+        <el-form-item
+          v-if="form.Type !== 'group' && form.Type !== 'table' && form.Type !== 'basicTable' && form.Type !== 'summary'"
+          :label="$t('trials:readingUnit:qsList:title:isRequired')" prop="IsRequired">
+          <el-radio-group v-model="form.IsRequired" :disabled="form.IsJudgeQuestion === true || form.ShowQuestion === 2"
+            @change="((val) => { isRequiredChange(val, form) })">
+            <el-radio v-for="item of $d.QuestionRequired" :key="`QuestionRequired${item.value}`" :label="item.value">
              {{ item.label }}
            </el-radio>
          </el-radio-group>
        </el-form-item>
        <!-- 必填依赖父问题 -->
-        <el-form-item
-          v-if="form.Type !== 'group' && form.IsRequired === 1"
-          :label="$t('trials:readingUnit:qsList:title:relevanceId')"
-          prop="RelevanceId"
-        >
-          <el-select
-            v-model="form.RelevanceId"
-            clearable
-            @change="((val)=>{relevanceQuestionChange(val, form)})"
-          >
-            <el-option
-              v-for="item of parentOptions"
-              :key="`RelevanceId${item.QuestionId}`"
-              :label="item.QuestionName"
-              :value="item.QuestionId"
-            />
+        <el-form-item v-if="form.Type !== 'group' && form.IsRequired === 1"
+          :label="$t('trials:readingUnit:qsList:title:relevanceId')" prop="RelevanceId">
+          <el-select v-model="form.RelevanceId" clearable @change="((val) => { relevanceQuestionChange(val, form) })">
+            <el-option v-for="item of parentOptions" :key="`RelevanceId${item.QuestionId}`" :label="item.QuestionName"
+              :value="item.QuestionId" />
          </el-select>
        </el-form-item>
        <!-- 必填触发值 -->
-        <el-form-item
-          v-if="form.RelevanceId && form.IsRequired === 1"
-          :label="$t('trials:readingUnit:qsList:title:relevanceValueList')"
-          prop="RelevanceValueList"
-        >
+        <el-form-item v-if="form.RelevanceId && form.IsRequired === 1"
+          :label="$t('trials:readingUnit:qsList:title:relevanceValueList')" prop="RelevanceValueList">
          <el-select v-model="form.RelevanceValueList" clearable multiple>
-            <el-option
-              v-for="item of reParentTriggerValOptions"
-              :key="item.id"
-              :label="item.label"
-              :value="String(item.value)"
-            />
+            <el-option v-for="item of reParentTriggerValOptions" :key="item.id" :label="item.label"
+              :value="String(item.value)" />
          </el-select>
        </el-form-item>
        <!-- 导出标识 -->
@ -174,175 +105,106 @@
          </el-radio-group>
        </el-form-item> -->
        <!-- 导出结果 -->
-        <el-form-item 
-          :label="$t('trials:readingUnit:qsList:title:ExportResult')"
-          v-if="form.Type === 'radio' || form.Type === 'select' || form.Type === 'input' || form.Type === 'textarea' || form.Type === 'number' || form.Type === 'class' || form.Type === 'calculation'"
-        >
+        <el-form-item :label="$t('trials:readingUnit:qsList:title:ExportResult')"
+          v-if="form.Type === 'radio' || form.Type === 'select' || form.Type === 'input' || form.Type === 'textarea' || form.Type === 'number' || form.Type === 'class' || form.Type === 'calculation'">
          <el-select v-model="form.ExportResult" multiple>
-            <el-option
-              v-for="item in CriterionDictionaryList.ExportResult"
-              :key="`ExportResult${item.value}`"
-              :value="parseInt(item.Code)"
-              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
-            >
+            <el-option v-for="item in CriterionDictionaryList.ExportResult" :key="`ExportResult${item.value}`"
+              :value="parseInt(item.Code)" :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value">
            </el-option>
          </el-select>
        </el-form-item>
        <!-- 限制编辑 -->
-        <el-form-item 
-          :label="$t('trials:readingUnit:qsList:title:limitEdit')" 
-          v-if="form.Type !== 'summary'"
-          prop="LimitEdit"
-          :rules="[
+        <el-form-item :label="$t('trials:readingUnit:qsList:title:limitEdit')" v-if="form.Type !== 'summary'"
+          prop="LimitEdit" :rules="[
            { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-          ]"
-        >
+          ]">
          <el-radio-group v-model="form.LimitEdit">
            <el-radio v-for="item of $d.LimitEdit" :key="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 !== 'summary'"
-          :label="$t('dictionary:template:criterionConfig:table:questionMark')"
-          prop="QuestionMark"
-        >
-          <el-select
-            v-model="form.QuestionMark"
-            clearable
-          >
-            <el-option
-              v-for="item of CriterionDictionaryList.QuestionMark"
-              :key="item.Id"
-              :value="parseInt(item.Code)"
-              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
-            />
+        <el-form-item v-if="form.Type !== 'group' && form.Type !== 'summary'"
+          :label="$t('dictionary:template:criterionConfig:table:questionMark')" prop="QuestionMark">
+          <el-select v-model="form.QuestionMark" clearable>
+            <el-option v-for="item of CriterionDictionaryList.QuestionMark" :key="item.Id" :value="parseInt(item.Code)"
+              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value" />
          </el-select>
        </el-form-item>
        <!-- 注释 -->
-        <el-form-item
-          :label="$t('trials:readingUnit:qsList:title:Remark')"
-          prop="Remark"
-        >
+        <el-form-item :label="$t('trials:readingUnit:qsList:title:Remark')" prop="Remark">
          <el-input v-model="form.Remark" />
        </el-form-item>
        <!-- 序号 -->
-        <el-form-item 
-          :label="$t('trials:readingUnit:qsList:title:order')" 
-          prop="ShowOrder"
-          :rules="[
+        <el-form-item :label="$t('trials:readingUnit:qsList:title:order')" prop="ShowOrder" :rules="[
          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-          ]"
-        >
-          <el-input-number
-            v-model="form.ShowOrder"
-            controls-position="right"
-            :min="0"
-          />
+        ]">
+          <el-input-number v-model="form.ShowOrder" controls-position="right" :min="0" />
        </el-form-item>
        <!-- 重复出现最大次数 -->
-        <el-form-item :label="$t('dictionary:template:criterionConfig:table:maxRowCount')" v-if="form.Type !== 'summary' && form.Type !== 'screenshot' && form.Type !== 'upload'">
-          <el-input-number
-            v-model="form.MaxRowCount"
-            controls-position="right"
-            :min="0"
-            :max="10"
-          />
+        <el-form-item :label="$t('dictionary:template:criterionConfig:table:maxRowCount')"
+          v-if="form.Type !== 'summary' && form.Type !== 'screenshot' && form.Type !== 'upload'">
+          <el-input-number v-model="form.MaxRowCount" controls-position="right" :min="0" :max="10" />
        </el-form-item>
        <!-- 问题分类 -->
-        <el-form-item :label="$t('dictionary:template:criterionConfig:table:questionClassify')" v-if="criterionType === 2">
+        <el-form-item :label="$t('dictionary:template:criterionConfig:table:questionClassify')"
+          v-if="criterionType === 2">
          <el-select v-model="form.QuestionClassify" clearable>
-            <el-option
-              v-for="item of $d.QuestionClassify"
-              :key="item.id"
-              :label="item.label"
-              :value="item.value"
-            />
+            <el-option v-for="item of $d.QuestionClassify" :key="item.id" :label="item.label" :value="item.value" />
          </el-select>
        </el-form-item>
        <!-- 私有属性 -->
-        <el-divider content-position="left">{{$t('trials:readingUnit:title:privateProperties')}}</el-divider>
+        <el-divider content-position="left">{{ $t('trials:readingUnit:title:privateProperties') }}</el-divider>
+        <!-- 下拉框单选或多选 -->
+        <el-form-item v-if="form.Type === 'select'" :label="$t('trials:readingUnit:qsList:title:MultipleSelect')"
+          prop="OptionTypeEnum" :rules="[
+            { required: true, message: this.$t('common:ruleMessage:specify') }
+          ]">
+          <el-radio-group v-model="form.OptionTypeEnum">
+            <el-radio v-for="item of $d.OptionType" :key="item.id" :label="item.value">
+              {{ item.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
        <!-- 选项类型 -->
-        <el-form-item
-          v-if="form.Type === 'select' || form.Type === 'radio' || form.Type === 'input'"
-          :label="$t('trials:readingUnit:label:QuestionGenre')"
-          prop="TableQuestionType"
-          :rules="[
-            { required: form.Type !== 'input', message: this.$t('common:ruleMessage:select')}
-          ]"
-        >
-          <el-radio-group
-            v-model="form.TableQuestionType"
-            @change="((val)=>{tableQuestionTypeChange(val, form)})"
-          >
-            <el-radio
-              v-for="item of $d.TableQuestionType"
-              :key="item.id"
-              :label="item.value"
-              :disabled="(form.Type === 'radio' && (item.value===1 || item.value===2)) || (form.Type === 'input' && (item.value===0 || item.value===3))"
-            >
+        <el-form-item v-if="form.Type === 'select' || form.Type === 'radio' || form.Type === 'input'"
+          :label="$t('trials:readingUnit:label:QuestionGenre')" prop="TableQuestionType" :rules="[
+            { required: form.Type !== 'input', message: this.$t('common:ruleMessage:select') }
+          ]">
+          <el-radio-group v-model="form.TableQuestionType" @change="((val) => { tableQuestionTypeChange(val, form) })">
+            <el-radio v-for="item of $d.TableQuestionType" :key="item.id" :label="item.value"
+              :disabled="(form.Type === 'radio' && (item.value === 1 || item.value === 2)) || (form.Type === 'input' && (item.value === 0 || item.value === 3))">
              {{ item.label }}
            </el-radio>
          </el-radio-group>
        </el-form-item>
        <!-- 选项 -->
-        <el-form-item
-          v-if="form.TableQuestionType === 0  || form.Type === 'class'"
-          :label="$t('trials:qcCfg:table:typeValue')"
-          prop="TypeValue"
-        >
-          <el-input
-            v-model="form.TypeValue"
-            :placeholder="$t('trials:qcCfg:message:typeValue')"
-            @change="typeValueChange"
-          />
+        <el-form-item v-if="form.TableQuestionType === 0 || form.Type === 'class'"
+          :label="$t('trials:qcCfg:table:typeValue')" prop="TypeValue">
+          <el-input v-model="form.TypeValue" :placeholder="$t('trials:qcCfg:message:typeValue')"
+            @change="typeValueChange" />
        </el-form-item>
        <!-- 关联问题 -->
-        <el-form-item
-          v-if="form.TableQuestionType === 2"
-          :label="$t('dictionary:template:criterionConfig:table:dependParentId')"
-          prop="DependParentId"
-        >
-          <el-select
-            v-model="form.DependParentId"
-          >
-            <el-option
-              v-for="item of parentOptions"
-              :key="`DependParentId${item.QuestionId}`"
-              :label="item.QuestionName"
-              :value="item.QuestionId"
-            />
+        <el-form-item v-if="form.TableQuestionType === 2"
+          :label="$t('dictionary:template:criterionConfig:table:dependParentId')" prop="DependParentId">
+          <el-select v-model="form.DependParentId">
+            <el-option v-for="item of parentOptions" :key="`DependParentId${item.QuestionId}`"
+              :label="item.QuestionName" :value="item.QuestionId" />
          </el-select>
        </el-form-item>
        <!-- 关联字段 -->
-        <el-form-item
-          v-if="form.TableQuestionType === 1 || !!form.DependParentId"
-          :label="$t('dictionary:template:criterionConfig:table:dataTableColumn')"
-          prop="DataTableColumn"
-        >
+        <el-form-item v-if="form.TableQuestionType === 1 || !!form.DependParentId"
+          :label="$t('dictionary:template:criterionConfig:table:dataTableColumn')" prop="DataTableColumn">
          <el-select v-model="form.DataTableColumn">
-            <el-option
-              v-for="item of CriterionDictionaryList.OrganColumn"
-              :key="item.Id"
-              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
-              :value="item.Code"
-            />
+            <el-option v-for="item of CriterionDictionaryList.OrganColumn" :key="item.Id"
+              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value" :value="item.Code" />
          </el-select>
        </el-form-item>
        <!-- 关联字典 -->
-        <el-form-item
-          v-if="form.TableQuestionType === 3 || form.TableQuestionType === 2"
-          :label="$t('dictionary:template:criterionConfig:table:relatedDictionaryCode')"
-          prop="DictionaryCode"
-          :rules="[{ required: form.TableQuestionType === 3, message: '请选择', trigger: 'blur' }]"
-        >
+        <el-form-item v-if="form.TableQuestionType === 3 || form.TableQuestionType === 2"
+          :label="$t('dictionary:template:criterionConfig:table:relatedDictionaryCode')" prop="DictionaryCode"
+          :rules="[{ required: form.TableQuestionType === 3, message: '请选择', trigger: 'blur' }]">
          <el-select v-model="form.DictionaryCode">
-            <el-option
-              v-for="item of dicList"
-              :key="item.Id"
-              :label="item.Code"
-              :value="item.Code"
-            />
+            <el-option v-for="item of dicList" :key="item.Id" :label="item.Code" :value="item.Code" />
          </el-select>
        </el-form-item>
        <!-- 默认值 -->
@ -354,35 +216,23 @@
              :label="item.label"
              :value="item.value.toString()"
            /> -->
-            <el-option
-              v-for="item of highlightAnswers"
-              :key="item.Id"
-              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
-              :value="item.Code"
-            />
+            <el-option v-for="item of highlightAnswers" :key="item.Id"
+              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value" :value="item.Code" />
          </el-select>
        </el-form-item>
        <!-- 默认值 -->
        <el-form-item v-if="form.TableQuestionType === 0" :label="$t('trials:readingUnit:qsList:title:defaultValue')">
          <el-select v-model="form.DefaultValue" clearable>
-            <el-option
-              v-for="item of form.TypeValue ? form.TypeValue.split('|') : []"
-              :key="item"
-              :label="item"
-              :value="item"
-            />
+            <el-option v-for="item of form.TypeValue ? form.TypeValue.split('|') : []" :key="item" :label="item"
+              :value="item" />
          </el-select>
        </el-form-item>
        <!-- 高亮标记值 -->
-        <el-form-item v-if="form.Type === 'select' || form.Type === 'radio'" :label="$t('trials:readingUnit:qsList:title:highlightAnswers')" prop="HighlightAnswerList">
+        <el-form-item v-if="form.Type === 'select' || form.Type === 'radio' || form.Type === 'calculation'"
+          :label="$t('trials:readingUnit:qsList:title:highlightAnswers')" prop="HighlightAnswerList">
          <el-select v-model="form.HighlightAnswerList" clearable multiple>
            <template v-if="form.TypeValue">
-              <el-option
-                v-for="item of form.TypeValue.split('|')"
-                :key="item"
-                :label="item"
-                :value="item"
-              />
+              <el-option v-for="item of form.TypeValue.split('|')" :key="item" :label="item" :value="item" />
            </template>
            <template v-else-if="form.DictionaryCode">
              <!-- <el-option
@ -391,24 +241,16 @@
                :label="item.label"
                :value="item.value.toString()"
              /> -->
-              <el-option
-                v-for="item of highlightAnswers"
-                :key="item.Id"
-                :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
-                :value="item.Code"
-              />
+              <el-option v-for="item of highlightAnswers" :key="item.Id"
+                :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value" :value="item.Code" />
            </template>
          </el-select>
        </el-form-item>
        <!-- 最大长度 -->
-        <el-form-item 
-          v-if="form.Type === 'input' || form.Type === 'textarea'"
-          :label="$t('trials:readingUnit:qsList:title:MaxAnswerLength')"
-          prop="MaxAnswerLength"
-          :rules="[
+        <el-form-item v-if="form.Type === 'input' || form.Type === 'textarea'"
+          :label="$t('trials:readingUnit:qsList:title:MaxAnswerLength')" prop="MaxAnswerLength" :rules="[
            { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }
-          ]"
-        >
+          ]">
          <el-input-number v-model="form.MaxAnswerLength" :min="0"></el-input-number>
        </el-form-item>
        <!-- 是否复制前值 -->
@ -425,138 +267,82 @@
          />
        </el-form-item> -->
        <!-- 数值类型 -->
-        <el-form-item
-          v-if="form.Type === 'number' || form.Type === 'calculation'"
-          :label="$t('trials:readingUnit:qsList:title:valueType')"
-          prop="ValueType"
-          :rules="[
+        <el-form-item v-if="form.Type === 'number' || form.Type === 'calculation'"
+          :label="$t('trials:readingUnit:qsList:title:valueType')" prop="ValueType" :rules="[
            { required: true, message: this.$t('common:ruleMessage:select') }
-          ]"
-        >
-          <el-radio-group
-            v-model="form.ValueType"
-          >
-            <el-radio
-              v-for="item of $d.ValueType"
-              :key="item.id"
-              :label="item.value"
-            >
+          ]">
+          <el-radio-group v-model="form.ValueType">
+            <el-radio v-for="item of $d.ValueType" :key="item.id" :label="item.value">
              {{ item.label }}
            </el-radio>
          </el-radio-group>
        </el-form-item>

        <!-- 单位 -->
-        <el-form-item
-          v-if="form.Type === 'number' || form.Type === 'calculation'"
-          :label="$t('trials:readingUnit:qsList:title:unit')"
-          prop="Unit"
-          :rules="[
+        <el-form-item v-if="form.Type === 'number' || form.Type === 'calculation'"
+          :label="$t('trials:readingUnit:qsList:title:unit')" prop="Unit" :rules="[
            { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-          ]"
-        >
-          <el-radio-group
-            v-model="form.Unit"
-          >
-            <el-radio
-              v-for="item of $d.ValueUnit"
-              :key="item.id"
-              :label="item.value"
-            >
+          ]">
+          <el-radio-group v-model="form.Unit">
+            <el-radio v-for="item of $d.ValueUnit" :key="item.id" :label="item.value">
              {{ item.label }}
            </el-radio>
          </el-radio-group>
        </el-form-item>
+        <!-- 图表展示-->
+        <el-form-item v-if="form.Type === 'number' || form.Type === 'calculation'"
+          :label="$t('trials:readingUnit:qsList:title:ShowChartTypeEnum')" prop="ShowChartTypeEnum">
+          <el-radio-group v-model="form.ShowChartTypeEnum">
+            <el-radio v-for="item of $d.ShowChartType" :key="item.id" :label="item.value">{{ item.label }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
        <!-- 最大上传个数 -->
-        <el-form-item 
-          v-if="form.Type === 'upload'" 
-          :label="$t('trials:readingUnit:qsList:title:imageCount')"
-          prop="ImageCount"
-        >
-          <el-input-number
-            v-model="form.ImageCount"
-            controls-position="right"
-            :min="0"
-            :max="10"
-          />
+        <el-form-item v-if="form.Type === 'upload'" :label="$t('trials:readingUnit:qsList:title:imageCount')"
+          prop="ImageCount">
+          <el-input-number v-model="form.ImageCount" controls-position="right" :min="0" :max="10" />
        </el-form-item>
        <!-- 文件类型 -->
-        <el-form-item 
-          v-if="form.Type === 'upload'" 
-          :label="$t('trials:readingUnit:qsList:title:FileType')"
+        <el-form-item v-if="form.Type === 'upload'" :label="$t('trials:readingUnit:qsList:title:FileType')"
          prop="FileType"
-          :rules="[{ type: 'array', required: true, message: this.$t('common:ruleMessage:specify'), trigger: [ 'change'] }]"
-        >
-          <el-checkbox-group
-            v-model="form.FileType"
-            @change="(v) => {
+          :rules="[{ type: 'array', required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['change'] }]">
+          <el-checkbox-group v-model="form.FileType" @change="(v) => {
            if (v && v.includes('-1')) {
              form.FileType = ['-1']
            }
-            }"
-          >
-            <el-checkbox
-              v-for="item of $d.fileType"
-              :key="`fileType${item.value}`"
-              :value="item.value + ''"
-              :label="item.value"
-              :disabled="form.FileType && form.FileType.includes('-1') && item.value !== '-1'"
-            >
+          }">
+            <el-checkbox v-for="item of $d.fileType" :key="`fileType${item.value}`" :value="item.value + ''"
+              :label="item.value" :disabled="form.FileType && form.FileType.includes('-1') && item.value !== '-1'">
              {{ item.label }}
            </el-checkbox>
          </el-checkbox-group>
        </el-form-item>
        <!-- 分类 -->
        <!-- 分类数据来源 -->
-        <el-form-item
-          v-if="form.Type === 'class'"
-          :label="$t('dictionary:template:criterionConfig:table:classifyQuestion')"
-          prop="ClassifyTableQuestionId"
-        >
+        <el-form-item v-if="form.Type === 'class'"
+          :label="$t('dictionary:template:criterionConfig:table:classifyQuestion')" prop="ClassifyTableQuestionId">
          <el-select v-model="form.ClassifyTableQuestionId" clearable>
-            <el-option v-for="item of Questions" :key="item.Id" :label="item.QuestionName"
-                      :value="item.Id"/>
+            <el-option v-for="item of Questions" :key="item.Id" :label="item.QuestionName" :value="item.Id" />
          </el-select>
        </el-form-item>
        <!-- 分类算法 -->
-        <el-form-item
-          v-if="form.Type === 'class'"
-          :label="$t('dictionary:template:criterionConfig:table:classifyAlgorithms')"
-          prop="ClassifyAlgorithms"
-        >
+        <el-form-item v-if="form.Type === 'class'"
+          :label="$t('dictionary:template:criterionConfig:table:classifyAlgorithms')" prop="ClassifyAlgorithms">
          <div>
-            <el-table
-              ref="CalculateTable"
-              :data="ClassifyAlgorithmsList"
-              style="margin: 10px;width: 100%"
-              size="small"
-            >
+            <el-table ref="CalculateTable" :data="ClassifyAlgorithmsList" style="margin: 10px;width: 100%" size="small">
              <!-- 运算类型 -->
-              <el-table-column
-                :label="$t('trials:readingUnit:label:label')"
-                show-overflow-tooltip
-                min-width="70"
-              >
+              <el-table-column :label="$t('trials:readingUnit:label:label')" show-overflow-tooltip min-width="70">
                <template slot-scope="scope">
                  {{ scope.row.label }}
                </template>
              </el-table-column>
              <!-- 运算类型 -->
-              <el-table-column
-                :label="$t('trials:readingUnit:label:gt')"
-                show-overflow-tooltip
-                min-width="128"
-              >
+              <el-table-column :label="$t('trials:readingUnit:label:gt')" show-overflow-tooltip min-width="128">
                <template slot-scope="scope">
                  <el-input-number v-model="scope.row.gt"></el-input-number>
                </template>
              </el-table-column>
              <!-- 运算类型 -->
-              <el-table-column
-                :label="$t('trials:readingUnit:label:lt')"
-                show-overflow-tooltip
-                min-width="128"
-              >
+              <el-table-column :label="$t('trials:readingUnit:label:lt')" show-overflow-tooltip min-width="128">
                <template slot-scope="scope">
                  <el-input-number v-model="scope.row.lt"></el-input-number>
                </template>
@ -569,11 +355,7 @@
    <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
      <el-form-item>
        <!-- 取消 -->
-        <el-button
-          size="small"
-          type="primary"
-          @click="close"
-        >
+        <el-button size="small" type="primary" @click="close">
          {{ $t('common:button:cancel') }}
        </el-button>
        <!-- 保存 -->
@ -666,7 +448,9 @@ export default {
        ClassifyAlgorithms: null,
        // ExportIdentification: 0,
        ExportResult: [],
-        DefaultValue:null
+        DefaultValue: null,
+        ShowChartTypeEnum: 0,
+        OptionTypeEnum: 0
        // IsEnable: true
      },
      rules: {
@ -776,7 +560,7 @@ export default {
          if (this.data.hasOwnProperty(k)) {
            if (k === 'ClassifyAlgorithms' && this.data[k] !== undefined && this.data[k] !== '') {
              this.ClassifyAlgorithmsList = JSON.parse(this.data[k])
-            } else if(k === 'FileType'){
+            } else if (k === 'FileType') {
              this.form[k] = this.data[k].split(',')
            } else {
              this.form[k] = this.data[k]
@ -792,10 +576,10 @@ export default {
            if (this.parentOptions[index].QuestionGenre === 3) {
              // this.parentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
              let dicCode = this.parentOptions[index].DictionaryCode
-              let res = await getCriterionDictionary({ReadingCriterionId: this.criterionId, DictionaryCode: dicCode})
+              let res = await getCriterionDictionary({ ReadingCriterionId: this.criterionId, DictionaryCode: dicCode })

-              this.parentTriggerValOptions = res.Result[dicCode].map(i=>{
-                return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+              this.parentTriggerValOptions = res.Result[dicCode].map(i => {
+                return { id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code }
              })
            } else {
              const options = []
@ -814,9 +598,9 @@ export default {
            if (this.parentOptions[i].QuestionGenre === 3) {
              // this.reParentTriggerValOptions = this.$d[this.parentOptions[i].DictionaryCode]
              let dicCode = this.parentOptions[i].DictionaryCode
-              let res = await getCriterionDictionary({ReadingCriterionId: this.criterionId, DictionaryCode: dicCode})
-              this.reParentTriggerValOptions = res.Result[dicCode].map(i=>{
-                return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+              let res = await getCriterionDictionary({ ReadingCriterionId: this.criterionId, DictionaryCode: dicCode })
+              this.reParentTriggerValOptions = res.Result[dicCode].map(i => {
+                return { id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code }
              })
            } else {
              const options = []
@ -904,10 +688,10 @@ export default {
          if (this.parentOptions[index].QuestionGenre === 3) {
            // this.parentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
            let dicCode = this.parentOptions[index].DictionaryCode
-              let res = await getCriterionDictionary({ReadingCriterionId: this.criterionId, DictionaryCode: dicCode})
+            let res = await getCriterionDictionary({ ReadingCriterionId: this.criterionId, DictionaryCode: dicCode })

-              this.parentTriggerValOptions = res.Result[dicCode].map(i=>{
-                return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+            this.parentTriggerValOptions = res.Result[dicCode].map(i => {
+              return { id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code }
            })
          } else {
            const options = []
@ -929,10 +713,10 @@ export default {
          if (this.parentOptions[index].QuestionGenre === 3) {
            // this.reParentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
            let dicCode = this.parentOptions[index].DictionaryCode
-            let res = await getCriterionDictionary({ReadingCriterionId: this.criterionId, DictionaryCode: dicCode})
+            let res = await getCriterionDictionary({ ReadingCriterionId: this.criterionId, DictionaryCode: dicCode })

-            this.reParentTriggerValOptions = res.Result[dicCode].map(i=>{
-              return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+            this.reParentTriggerValOptions = res.Result[dicCode].map(i => {
+              return { id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code }
            })
          } else {
            const options = []
@ -993,6 +777,8 @@ export default {
      // form.ExportIdentification = 0
      form.ExportResult = []
      form.DefaultValue = null
+      form.ShowChartTypeEnum = 0
+      form.OptionTypeEnum = 0
    },
    close() {
      this.$emit('close')
@ -1001,5 +787,4 @@ export default {
  }
 }
 </script>
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>
--- a/src/views/dictionary/template/email/components/EmailList.vue
+++ b/src/views/dictionary/template/email/components/EmailList.vue
@ -9,11 +9,11 @@
          </el-select>
        </el-form-item>
        <!-- 是否加急 -->
-        <el-form-item :label="$t('dictionary:email:label:IsUrgent')" v-if="!systemLevel">
+        <!-- <el-form-item :label="$t('dictionary:email:label:IsUrgent')" v-if="!systemLevel">
          <el-select v-model="searchData.IsUrgent" clearable style="width: 100px">
            <el-option v-for="item of $d.YesOrNo" :value="item.value" :label="item.label" :key="item.id" />
          </el-select>
-        </el-form-item>
+        </el-form-item> -->
        <!-- 是否启用 -->
        <el-form-item :label="$t('trials:emailManageCfg:table:IsEnable')" v-if="!systemLevel">
          <el-select v-model="searchData.IsEnable" clearable style="width: 100px">
@ -41,7 +41,8 @@
            <el-option v-for="item of UserTypeList" :value="item.value" :label="item.label" :key="item.id" />
          </el-select>
        </el-form-item>
-        <el-form-item :label="$t('trials:emailManageCfg:form:EmailUrgent')" v-if="systemLevel === 1">
+        <!--v-if="systemLevel === 1"-->
+        <el-form-item :label="$t('trials:emailManageCfg:form:EmailUrgent')">
          <el-select v-model="searchData.EmailUrgentEnum" clearable style="width: 100px">
            <el-option v-for="item of $d.EmailUrgent" :value="item.value" :label="item.label" :key="item.id" />
          </el-select>
--- a/src/views/dictionary/template/index.vue
+++ b/src/views/dictionary/template/index.vue
@ -6,68 +6,45 @@
        <qc-questions v-if="activeTab == 'qc'" />
      </el-tab-pane>
      <!-- 阅片标准配置 -->
-      <el-tab-pane
-        :label="$t('dictionary:template:tab:criterionsConfig')"
-        name="criterions"
-      >
+      <el-tab-pane :label="$t('dictionary:template:tab:criterionsConfig')" name="criterions">
        <criterions-tmp v-if="activeTab == 'criterions'" />
      </el-tab-pane>
      <!-- 临床数据配置 -->
-      <el-tab-pane
-        :label="$t('dictionary:template:tab:clinicalDataConfig')"
-        name="clinicalData"
-      >
+      <el-tab-pane :label="$t('dictionary:template:tab:clinicalDataConfig')" name="clinicalData">
        <clinical-data v-if="activeTab == 'clinicalData'" />
      </el-tab-pane>
      <!-- 医学审核问题配置 -->
-      <el-tab-pane
-        :label="$t('dictionary:template:tab:medicalConfig')"
-        name="medicalAudit"
-      >
+      <el-tab-pane :label="$t('dictionary:template:tab:medicalConfig')" name="medicalAudit">
        <medical-audit v-if="activeTab == 'medicalAudit'" />
      </el-tab-pane>
      <!-- DICOM字段匿名化配置 -->
-      <el-tab-pane
-        :label="$t('dictionary:template:tab:dicomTagConfig')"
-        name="anonymization"
-      >
+      <el-tab-pane :label="$t('dictionary:template:tab:dicomTagConfig')" name="anonymization">
        <Anonymization v-if="activeTab == 'anonymization'" />
      </el-tab-pane>
      <!-- DICOM字段新增配置 -->
-      <el-tab-pane
-        :label="$t('dictionary:template:tab:dicomTagAddConfig')"
-        name="increasefields"
-      >
+      <el-tab-pane :label="$t('dictionary:template:tab:dicomTagAddConfig')" name="increasefields">
        <IncreaseFields v-if="activeTab == 'increasefields'" />
      </el-tab-pane>
      <!-- 邮件管理 -->
-      <el-tab-pane
-        :label="$t('dictionary:template:tab:emailConfig')"
-        name="email"
-      >
+      <el-tab-pane :label="$t('dictionary:template:tab:emailConfig')" name="email">
        <Email v-if="activeTab == 'email'" />
      </el-tab-pane>
      <!-- 签名管理 -->
-      <el-tab-pane
-        :label="$t('dictionary:template:tab:signConfig')"
-        name="sign"
-      >
+      <el-tab-pane :label="$t('dictionary:template:tab:signConfig')" name="sign">
        <Sign v-if="activeTab == 'sign'" />
      </el-tab-pane>
      <!-- 浏览器推荐 -->
-      <el-tab-pane
-        :label="$t('dictionary:template:tab:browserConfig')"
-        name="browser"
-      >
+      <el-tab-pane :label="$t('dictionary:template:tab:browserConfig')" name="browser">
        <Browser v-if="activeTab == 'browser'" />
      </el-tab-pane>
      <!-- 文件记录 -->
-      <el-tab-pane
-        :label="$t('dictionary:template:tab:fileConfig')"
-        name="file"
-      >
+      <el-tab-pane :label="$t('dictionary:template:tab:fileConfig')" name="file">
        <File v-if="activeTab == 'file'" />
      </el-tab-pane>
+      <!-- 用户协议 -->
+      <el-tab-pane :label="$t('dictionary:template:tab:agreement')" name="agreement">
+        <Agreement v-if="activeTab == 'agreement'" />
+      </el-tab-pane>
    </el-tabs>
  </div>
 </template>
@ -82,6 +59,7 @@ import Email from './email/index.vue'
 import Sign from './sign/index.vue'
 import Browser from './browser/index.vue'
 import File from './file/index.vue'
+import Agreement from './agreement/index.vue'
 export default {
  name: 'Questions',
  components: {
@ -95,6 +73,7 @@ export default {
    MedicalAudit,
    Browser,
    File,
+    Agreement
  },
  data() {
    return {
@ -122,16 +101,18 @@ export default {
    display: flex;
    flex-direction: column;
  }
+
  .el-tabs__header {
    height: 40px;
    margin-bottom: 5px;
  }
+
  .el-tabs__content {
    flex: 1;
+
    .el-tab-pane {
      height: 100%;
    }
  }
 }
 </style>
-
--- a/src/views/email-recompose/index.vue
+++ b/src/views/email-recompose/index.vue
@ -1,29 +1,18 @@
 <template>
  <div style="display: flex; justify-content: center">
-    <div
-      style="
+    <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 class="trial-myinfo-head" style="font-size: 30px; line-height: 120px">
        <!-- 首次登录修改密码 -->
-        {{ $t('recompose:title:init') }}
+        {{ !isUpdate ? $t('recompose:title:init') : $t('recompose:title:update') }}
      </div>
-      <el-form
-        ref="passwordForm"
-        v-loading="loading"
-        label-position="right"
-        :model="password"
-        :rules="passwordFormRules"
-        :label-width="$i18n.locale == 'zh' ? '100px' : '200px'"
-      >
+      <el-form ref="passwordForm" v-loading="loading" label-position="right" :model="password"
+        :rules="passwordFormRules" :label-width="$i18n.locale == 'zh' ? '100px' : '200px'">
        <!-- 邮箱 -->
        <el-form-item :label="$t('recompose:form:email')" prop="Email">
          <el-input v-model="password.Email" disabled />
@ -34,32 +23,15 @@
        </el-form-item> -->
        <!-- 用户名 -->
        <el-form-item :label="$t('recompose:form:userName')" prop="NewUserName">
-          <el-input v-model="password.NewUserName" />
+          <el-input v-model="password.NewUserName" :disabled="isUpdate" />
        </el-form-item>
        <!-- 新密码 -->
-        <el-form-item
-          class="my_new_pwd"
-          :label="$t('recompose:form:newPassword')"
-          prop="NewPassWord"
-        >
-          <el-input
-            v-model="password.NewPassWord"
-            type="password"
-            show-password
-            auto-complete="new-password"
-          />
+        <el-form-item class="my_new_pwd" :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">
          <!-- 取消 -->
@ -175,6 +147,7 @@ export default {
      },
      userId: null,
      loading: false,
+      isUpdate: false
    }
  },
  computed: {
@ -182,11 +155,15 @@ export default {
  },
  mounted() {
    this.password.UserId = this.$route.query.UserId
+    zzSessionStorage.setItem('identityUserId', this.$route.query.UserId)
    this.password.NewUserName = this.$route.query.UserName
    this.password.Email = this.$route.query.Email
    this.password.UserType = this.$route.query.UserType
    this.password.access_token = this.$route.query.access_token
    this.$i18n.locale = this.$route.query.lang
+    if (this.$route.query.isUpdate) {
+      this.isUpdate = true
+    }
    this.setLanguage(this.$route.query.lang)
    this.$updateDictionary()
    // if (!this.password.NewUserName) {
@ -229,9 +206,15 @@ export default {
              this.loading = false
              if (res.IsSuccess) {
                // 修改成功,请重新登录账号
+                if (!this.isUpdate) {
                  this.$message.success(
                    this.$t('recompose:message:updatedSuccessfully')
                  )
+                } else {
+                  this.$message.success(
+                    this.$t('recompose:message:updatedSuccess')
+                  )
+                }
                setTimeout(() => {
                  this.logout()
                }, 500)
@ -256,12 +239,14 @@ export default {
 .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;
@ -277,10 +262,12 @@ input:-webkit-autofill {
  background-image: none;
  transition: background-color 50000s ease-in-out 0s;
 }
+
 input {
  background-color: transparent;
  caret-color: #fff;
 }
+
 ::v-deep .is-error.my_new_pwd {
  margin-bottom: 45px;
 }
--- a/src/views/forgetpassword/index.vue
+++ b/src/views/forgetpassword/index.vue
@ -21,13 +21,19 @@
        <el-form-item :label="$t('trials:researchForm:form:verifyCode')" required>
          <el-col :span="18">
            <el-form-item prop="VerificationCode">
+              <div style="display: flex;justify-content: space-between;">
                <el-input v-model="form.VerificationCode" autocomplete="off" />
+                <el-button size="small" class="codeBtn" :disabled="sendDisabled" @click="handleSendCode"
+                  style="width: 30%;margin-left: 10px;">
+                  {{ sendTitle }}
+                </el-button>
+              </div>
+
            </el-form-item>
          </el-col>
-          <el-col :span="6" style="text-align: right">
-            <el-button size="small" type="primary" style="width: 80%" :disabled="sendDisabled"
-              @click="handleSendCode">{{ sendTitle }}</el-button>
-          </el-col>
+          <!-- <el-col :span="6" style="text-align: right">
+     
+          </el-col> -->
        </el-form-item>
      </el-form>
      <!-- 校验 -->
@ -381,6 +387,21 @@ export default {
 /*::v-deep .is-error{*/
 /*  margin-bottom: 40px;*/
 /*}*/
+.codeBtn {
+  color: #409EFF;
+  border-color: #409EFF;
+}
+
+.codeBtn.is-disabled,
+.codeBtn.is-disabled:focus,
+.codeBtn.is-disabled:hover {
+  color: #c0c4cc;
+  cursor: not-allowed;
+  background-image: none;
+  background-color: #fff;
+  border-color: #ebeef5;
+}
+
 .is-error.my_new_pwd {
  margin-bottom: 45px;
 }
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@ -19,10 +19,14 @@
      <div class="login-r">
        <div class="title-container">
          <!-- IRC Management System -->
-          <div v-if="NODE_ENV === 'usa'">
+          <!-- <div v-if="NODE_ENV === 'usa'"> -->
            <svg-icon icon-class="login-logo" style="width: 300px; height: 94px" />
-          </div>
-          <div class="title" v-else>{{ $t('login:title:system') }}</div>
+          <!-- </div> -->
+          <!-- <div class="title" v-else>
+            <img src="@/assets/system.png" alt=""
+              :style="{ width: isEN ? '180px' : '200px', height: isEN ? '60px' : '65px' }" />
+            <div :style="`font-size:${isEN ? '28px' : '35px'}`">{{ $t('login:title:system') }}</div>
+          </div> -->
        </div>
        <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on"
          label-position="left">
@ -75,18 +79,27 @@
            </span> -->
          </el-form-item>
          <!-- Login -->
-          <el-button :loading="loading" type="primary" style="
+          <el-button :loading="loading" type="primary" :disabled="!checked" style="
              width: 100%;
              margin-bottom: 10px;
              background-color: rgb(0, 147, 221);
            " size="medium" @click.native.prevent="handleLogin">
            {{ $t('login:button:login') }}
          </el-button>
+          <div class="PrivacyPolicy" style="font-size: 14px;">
+            <el-checkbox v-model="checked" style="margin-right: 5px;" />
+            <span>{{ $t('login:message:PrivacyPolicy') }}</span>
+            <span style="cursor: pointer;color:#428bca" @click="viewAgreement(0)">{{ $t('login:message:UserAgreement')
+            }}</span>
+            <span>{{ $t('login:message:and') }}</span>
+            <span style="cursor: pointer;color:#428bca" @click="viewAgreement(1)">{{
+              $t('login:message:PrivacyPolicyName') }}</span>
+          </div>
          <div style="text-align: right">
-            <TopLang v-if="
+            <!-- <TopLang v-if="
              VUE_APP_OSS_CONFIG_REGION !== 'oss-us-west-1' &&
              NODE_ENV !== 'usa'
-            " />
+            " /> -->
            <!-- Forget password? -->
            <el-button type="text" size="medium" @click.native.prevent="handleResetPwd" style="color: rgb(0, 147, 221)">
              {{ $t('login:button:forgetPassword') }}
@ -179,6 +192,9 @@ import Vcode from 'vue-puzzle-vcode'
 import browserTip from '@/views/dictionary/template/browser/tip.vue'
 import Img1 from '@/assets/pic-2.png'
 import toggleRole from '@/components/toggleRole'
+import {
+  getCurrentVersionUserAgreements,
+} from '@/api/dictionary'
 export default {
  name: 'Login',
  components: { TopLang, Vcode, browserTip, toggleRole },
@ -226,6 +242,8 @@ export default {
      Img1,
      toggleRoleVisible: false,
      toggleRoleLoading: false,
+      Agreement: [],
+      checked: true
    }
  },
  computed: {
@ -234,6 +252,9 @@ export default {
      // return window.location.host
      return 'elevateimaging.ai '
    },
+    isEN() {
+      return this.$i18n.locale !== 'zh'
+    }
  },
  watch: {
    '$i18n.locale': {
@ -254,7 +275,6 @@ export default {
    zzSessionStorage.setItem('loginType', this.loginType)
    localStorage.setItem('location', this.location)
    // zh-CN navigator.language
-    console.log(navigator.language, 'navigator.language')
    if (navigator.language !== 'zh-CN' && navigator.language !== 'zh-TW') {
      this.$i18n.locale = 'en'
      this.setLanguage('en')
@ -276,9 +296,30 @@ export default {
      }
    }
    this.$refs.browserTip.open()
+    this.getAgreementList()
  },
  methods: {
    ...mapMutations({ setLanguage: 'lang/setLanguage' }),
+    viewAgreement(type) {
+      let find = this.Agreement.find(item => item.IsCurrentVersion && item.UserAgreementTypeEnum === type)
+      if (!find) return this.$confirm(this.$t('login:message:noAgreement').replace('xxx', this.$fd('UserAgreementType', type)))
+      this.$AGR({
+        Id: find.Id,
+        IsEn_Us: this.$i18n.locale !== 'zh'
+      })
+    },
+    getAgreementList() {
+      getCurrentVersionUserAgreements({
+        PageIndex: 1,
+        PageSize: 20,
+        IsCurrentVersion: true
+      })
+        .then((res) => {
+          this.Agreement = res.Result
+        })
+        .catch(() => {
+        })
+    },
    openAbout() {
      this.aboutVisible = true
    },
@ -322,7 +363,7 @@ export default {
            this.$message.success(this.$t('login:message:login1'))
            setTimeout(() => {
              this.$router.push({
-                path: `/recompose?userName=${this.loginForm.username}`,
+                path: `/user-recompose?UserId=${res.BasicInfo.IdentityUserId}&Email=${res.BasicInfo.EMail}&UserName=${res.BasicInfo.UserName}&lang=${this.$i18n.locale}&access_token=${res.JWTStr}&isUpdate=1`,
              })
            }, 500)
            return
@ -334,7 +375,7 @@ export default {
              {
                callback: (action) => {
                  this.$router.push({
-                    path: `/recompose?userName=${this.loginForm.username}`,
+                    path: `/user-recompose?UserId=${res.BasicInfo.IdentityUserId}&Email=${res.BasicInfo.EMail}&UserName=${res.BasicInfo.UserName}&lang=${this.$i18n.locale}&access_token=${res.JWTStr}&isUpdate=1`,
                  })
                  return
                },
@ -346,7 +387,7 @@ export default {
            zzSessionStorage.removeItem('identityUserId')
            this.$MFA({
              UserId: res.BasicInfo.IdentityUserId,
-              EMail: res.BasicInfo.EMail,
+              EMail: res.BasicInfo.HiddenEmail,
              username: this.loginForm.username,
              callBack: this.changeRoleLogin,
              cancelBack: () => {
@ -661,7 +702,7 @@ $light_gray: #606266;

      .login-form {
        position: absolute;
-        top: 55%;
+        top: 60%;
        // transform: translateY(-50%);
        left: 50%;
        transform: translate(-50%, -50%);
@ -674,7 +715,7 @@ $light_gray: #606266;
      .title-container {
        // margin-bottom: 50px;
        text-align: center;
-        margin-top: 20%;
+        margin-top: 17%;

        .title {
          font-size: 35px;
--- a/src/views/none-dicom-show/components/image-viewer.vue
+++ b/src/views/none-dicom-show/components/image-viewer.vue
@ -2,13 +2,8 @@
 <template>
  <div style="width: 100%; height: 100%">
    <transition name="viewer-fade">
-      <div
-        v-show="urlList.length > 0"
-        ref="image-viewer__wrapper"
-        tabindex="-1"
-        class="image-viewer__wrapper"
-        :style="{ 'z-index': 5 }"
-      >
+      <div v-show="urlList.length > 0" ref="image-viewer__wrapper" tabindex="-1" class="image-viewer__wrapper"
+        :style="{ 'z-index': 5 }">
        <span class="image-viewer_desc">
          <!-- <span v-if="studyCode">NST00006</span>
          <span v-if="modality">CT</span>
@ -21,18 +16,12 @@
        </span>
        <!-- Arrow -->
        <template v-if="!isSingle">
-          <span
-            class="image-viewer__btn image-viewer__prev"
-            :class="{ 'is-disabled': !infinite && isFirst }"
-            @click="prev"
-          >
+          <span class="image-viewer__btn image-viewer__prev" :class="{ 'is-disabled': !infinite && isFirst }"
+            @click="prev">
            <i class="el-icon-arrow-left" />
          </span>
-          <span
-            class="el-image-viewer__btn el-image-viewer__next"
-            :class="{ 'is-disabled': !infinite && isLast }"
-            @click="next"
-          >
+          <span class="el-image-viewer__btn el-image-viewer__next" :class="{ 'is-disabled': !infinite && isLast }"
+            @click="next">
            <i class="el-icon-arrow-right" />
          </span>
        </template>
@ -44,36 +33,19 @@
            <i class="el-image-viewer__actions__divider" />
            <i class="el-icon-c-scale-to-original" @click="toggleMode" />
            <i class="el-image-viewer__actions__divider" />
-            <i
-              class="el-icon-refresh-left"
-              @click="handleActions('anticlocelise')"
-            />
-            <i
-              class="el-icon-refresh-right"
-              @click="handleActions('clocelise')"
-            />
+            <i class="el-icon-refresh-left" @click="handleActions('anticlocelise')" />
+            <i class="el-icon-refresh-right" @click="handleActions('clocelise')" />
          </div>
        </div>
        <!-- 图片 -->
        <div id="image-viewer__canvas" class="image-viewer__canvas">
          <template v-for="(item, i) in urlList">
-            <img
-              v-if="!~item.FileType.indexOf('pdf')"
-              v-show="i === index"
-              :ref="`img${i}`"
-              :key="item.Id"
-              crossorigin="anonymous"
-              :src="
-                item.FileType && item.FileType.indexOf('zip') >= 0
+            <img v-if="!~item.FileType.indexOf('pdf')" v-show="i === index" :ref="`img${i}`" :key="item.Id"
+              crossorigin="anonymous" :src="item.FileType && item.FileType.indexOf('zip') >= 0
                ? zipImg
                : `${OSSclientConfig.basePath}${item.Path}`
-              "
-              :style="imgStyle"
-              style="max-width: 100%; max-height: 100%"
-              @load="handleImgLoad"
-              @error="handleImgError"
-              @mousedown="handleMouseDown"
-            />
+                " :style="imgStyle" style="max-width: 100%; max-height: 100%" @load="handleImgLoad"
+              @error="handleImgError" @mousedown="handleMouseDown" />
          </template>
        </div>
      </div>
@ -108,11 +80,11 @@ export default {
    },
    onSwitch: {
      type: Function,
-      default: () => {},
+      default: () => { },
    },
    onClose: {
      type: Function,
-      default: () => {},
+      default: () => { },
    },
    initialIndex: {
      type: Number,
@ -172,7 +144,9 @@ export default {
      immediate: true,
      handler(val) {
        this.reset()
-        this.onSwitch(val)
+        if (val >= 0) {
+          this.onSwitch(this.urlList[val].Id)
+        }
      },
    },
  },
@ -349,6 +323,7 @@ export default {
  width: 100%;
  height: 100%;
 }
+
 .image-viewer__btn {
  position: absolute;
  z-index: 1;
@ -370,6 +345,7 @@ export default {
  height: 40px;
  font-size: 40px;
 }
+
 .image-viewer_desc {
  position: absolute;
  top: 40px;
@ -387,6 +363,7 @@ export default {
  border-radius: 17px;
  // border-radius: 2%;
 }
+
 .image-viewer__canvas {
  position: absolute;
  top: 50%;
@ -397,6 +374,7 @@ export default {
  justify-content: center;
  align-items: center;
 }
+
 .image-viewer__actions {
  left: 50%;
  bottom: 30px;
@ -408,6 +386,7 @@ export default {
  border-color: #fff;
  border-radius: 22px;
 }
+
 .image-viewer__actions__inner {
  width: 100%;
  height: 100%;
@ -419,6 +398,7 @@ export default {
  align-items: center;
  justify-content: space-around;
 }
+
 .image-viewer__next,
 .image-viewer__prev {
  top: 50%;
@ -429,15 +409,18 @@ export default {
  background-color: #606266;
  border-color: #fff;
 }
+
 .image-viewer__prev {
  transform: translateY(-50%);
  left: 40px;
 }
+
 .image-viewer__next {
  transform: translateY(-50%);
  right: 40px;
  text-indent: 2px;
 }
+
 .image-viewer__mask {
  position: absolute;
  width: 100%;
@ -447,9 +430,11 @@ export default {
  opacity: 0.5;
  // background:#000
 }
+
 .viewer-fade-enter-active {
  animation: viewer-fade-in 0.3s;
 }
+
 .viewer-fade-leave-active {
  animation: viewer-fade-out 0.3s;
 }
@ -459,6 +444,7 @@ export default {
    transform: translate3d(0, -20px, 0);
    opacity: 0;
  }
+
  100% {
    transform: translate3d(0, 0, 0);
    opacity: 1;
@ -470,6 +456,7 @@ export default {
    transform: translate3d(0, 0, 0);
    opacity: 1;
  }
+
  100% {
    transform: translate3d(0, -20px, 0);
    opacity: 0;
--- a/src/views/none-dicom-show/components/preview.vue
+++ b/src/views/none-dicom-show/components/preview.vue
@ -2,56 +2,29 @@
  <div class="none-dicom_preview-wrapper">
    <div class="image-viewer-wrapper">
      <!-- 预览图像 -->
-      <ImageViewer
-        v-if="previewVisible"
-        :on-switch="
-          (index) => {
+      <ImageViewer v-if="previewVisible" :on-switch="(index) => {
        selected(index)
      }
-        "
-        :initial-index="previewImage.index"
-        :url-list="previewImage.imgList"
-        :study-code="previewImage.studyCode"
-        :body-part="previewImage.bodyPart"
-        :modality="previewImage.modality"
-        :zip-img="zipImg"
-      />
+        " :initial-index="previewImage.index" :url-list="previewImage.imgList" :study-code="previewImage.studyCode"
+        :body-part="previewImage.bodyPart" :modality="previewImage.modality" :zip-img="zipImg" />
    </div>
    <div class="thumbnail-wrapper" style="z-index: 999; background-color: #fff">
      <div class="">
        <div class="img-wrapper">
-          <el-button
-            icon="el-icon-d-arrow-left"
-            plain
-            class="left to"
-            :disabled="disabledPrev"
-            @click="toRight"
-          />
+          <el-button icon="el-icon-d-arrow-left" plain class="left to" :disabled="disabledPrev" @click="toRight" />
          <div ref="imagesWrapper" class="images">
            <div v-if="noData" class="empty-text">
              <slot name="empty">暂无数据</slot>
            </div>
            <div v-show="!noData" class="items" :style="itemsStyle">
              <template v-for="(item, index) in previewImage.imgList">
-                <div
-                  v-if="!~item.FileType.indexOf('pdf')"
-                  :key="index"
-                  class="item-img"
-                  :style="imgSize"
-                  :class="{
-                    'is-active': index === currentIndex,
-                  }"
-                  @click="selected(index)"
-                >
-                  <img
-                    :title="item.FileName"
-                    crossorigin="anonymous"
-                    :src="
-                      item.FileType && item.FileType.indexOf('zip') >= 0
+                <div v-if="!~item.FileType.indexOf('pdf')" :key="index" class="item-img" :style="imgSize" :class="{
+                  'is-active': item.Id === currentFileId,
+                }" @click="selected(item.Id)">
+                  <img :title="item.FileName" crossorigin="anonymous" :src="item.FileType && item.FileType.indexOf('zip') >= 0
                    ? zipImg
                    : `${OSSclientConfig.basePath}${item.Path}`
-                    "
-                  />
+                    " />
                  <p v-if="item.FileName" class="item-date">
                    {{ `${index + 1}` }}
                  </p>
@ -59,13 +32,7 @@
              </template>
            </div>
          </div>
-          <el-button
-            icon="el-icon-d-arrow-right"
-            :disabled="disabledNext"
-            plain
-            class="right to"
-            @click="Left"
-          />
+          <el-button icon="el-icon-d-arrow-right" :disabled="disabledNext" plain class="right to" @click="Left" />
        </div>
      </div>
    </div>
@ -93,6 +60,10 @@ export default {
      type: Number,
      default: null,
    },
+    currentFileId: {
+      type: String,
+      default: ''
+    },
    previewImage: {
      type: Object,
      default: () => {
@ -167,7 +138,7 @@ export default {
    const scope = this
    window.onresize = function () {
      scope.pageSize = scope.wrapperWidth() / scope.itemWidth
-      scope.selected(scope.currentIndex)
+      scope.selected(scope.currentFileId)
    }
  },
  methods: {
@ -185,7 +156,8 @@ export default {
        this.translateX = maxTrans
      }
    },
-    selected(index) {
+    selected(id) {
+      let index = this.previewImage.imgList.findIndex(item => item.Id === id)
      const center = this.pageSize >> 1
      // 最后一页的中间位置
      const lastCenter = this.dataLength - center
@ -202,7 +174,7 @@ export default {
      if (this.currentIndex !== index) {
        this.currentIndex = index
      }
-      this.$emit('selectedImg', index)
+      this.$emit('selectedImg', id)
    },
    wrapperWidth() {
      if (this.$refs.imagesWrapper) {
@ -224,25 +196,30 @@ export default {
  .image-viewer-wrapper {
    flex: 1;
  }
+
  .thumbnail-wrapper {
    height: 130px;
  }
+
  .img-content {
    position: absolute;
    left: 0;
    bottom: 10px;
    width: 100%;
  }
+
  .img-wrapper {
    display: flex;
    position: relative;
    margin: 0 20px;
    height: 120px;
+
    .to {
      width: 32px;
      height: 100%;
      padding: 0;
    }
+
    .images::before {
      position: absolute;
      z-index: 5;
@ -251,16 +228,15 @@ export default {
      width: 84px;
      content: '';
      pointer-events: none;
-      background: -webkit-gradient(
-        linear,
+      background: -webkit-gradient(linear,
          left top,
          right top,
          from(#fff),
-        color-stop(50%, rgba(0, 0, 0, 0))
-      );
+          color-stop(50%, rgba(0, 0, 0, 0)));
      background: -o-linear-gradient(left, #fff, rgba(0, 0, 0, 0) 50%);
      background: linear-gradient(90deg, #fff, rgba(0, 0, 0, 0) 50%);
    }
+
    .images::after {
      position: absolute;
      z-index: 5;
@ -270,22 +246,22 @@ export default {
      width: 84px;
      content: '';
      pointer-events: none;
-      background: -webkit-gradient(
-        linear,
+      background: -webkit-gradient(linear,
          right top,
          left top,
          from(#fff),
-        color-stop(50%, rgba(0, 0, 0, 0))
-      );
+          color-stop(50%, rgba(0, 0, 0, 0)));
      background: -o-linear-gradient(right, #fff, rgba(0, 0, 0, 0) 50%);
      background: linear-gradient(270deg, #fff, rgba(0, 0, 0, 0) 50%);
    }
+
    .images {
      position: relative;
      overflow: hidden;
      width: 100%;
      height: 100%;
      margin: 0 2px;
+
      .empty-text {
        color: rgb(158, 158, 158);
        height: 100%;
@ -293,6 +269,7 @@ export default {
        align-items: center;
        justify-content: center;
      }
+
      .items {
        position: absolute;
        top: 0;
@ -302,6 +279,7 @@ export default {
        height: 100%;
        align-items: center;
        transition: transform 0.25s ease;
+
        .item-img {
          display: inline-block;
          box-sizing: border-box;
@ -309,6 +287,7 @@ export default {
          margin-right: 8px;
          border: 2px solid rgba(0, 0, 0, 0);
          cursor: pointer;
+
          .item-date {
            bottom: 0px;
            position: absolute;
@ -319,15 +298,18 @@ export default {
            line-height: 24px;
            color: white;
          }
+
          img {
            width: 100%;
            height: 100%;
          }
        }
+
        .item-img:hover::after {
          // border-color: #409EFF;
          opacity: 0;
        }
+
        .item-img::after {
          position: absolute;
          top: 0;
@ -342,9 +324,11 @@ export default {
          transition: opacity 0.3s ease;
          background-color: #fff;
        }
+
        .is-active {
          border-color: #409eff;
        }
+
        .is-active:after {
          opacity: 0;
        }
--- a/src/views/none-dicom-show/index.vue
+++ b/src/views/none-dicom-show/index.vue
@ -1,7 +1,13 @@
 <template>
  <div v-loading="loading" class="img-container">
    <el-card class="box-card left">
-      <div class="title">
+      <div class="title" style="display: flex;align-items: center;">
+        <div style="margin-right: 5px;cursor: pointer;" @click.stop="sortFile">
+          <i :class="['el-icon-caret-top', Asc === false || Asc === null ? '' : 'icon_check']"
+            style="display: block;margin-bottom: -5px;"></i>
+          <i :class="['el-icon-caret-bottom', Asc === true || Asc === null ? '' : 'icon_check']"
+            style="display: block; margin-top: -5px;"></i>
+        </div>
        {{ $t('trials:none-dicom-show:fileList') }}
      </div>
      <div class="left-content">
@ -43,6 +49,9 @@
                    <el-image v-else-if="
                      item.FileType === 'application/x-zip-compressed'
                    " style="width: 100%; height: 100%" :src="zip" fit="contain" crossorigin="anonymous" />
+                    <el-image v-else-if="
+                      !!~item.FileType.indexOf('mp4')
+                    " style="width: 100%; height: 100%" :src="mp4" fit="contain" crossorigin="anonymous" />
                  </div>
                  <div v-if="item.FileName.length < 15" class="img-text">
                    {{ `${j + 1}. ${item.FileName}` }}
@ -77,7 +86,8 @@
    <el-card class="box-card right">
      <div style="width: 100%; height: 100%" v-if="!showPDF">
        <Preview v-if="previewImage.imgList.length > 0" ref="previewImage" style="width: 100%"
-          :preview-image="previewImage" :value="currentStudyFileIndex" @selectedImg="selectedImg" />
+          :preview-image="previewImage" :value="currentStudyFileIndex" @selectedImg="selectedImg"
+          :currentFileId="currentFileId" />
      </div>
      <div style="width: 100%; height: 100%" v-else>
        <PreviewFile :file-path="pdfFile.path" :file-type="pdfFile.type" />
@ -95,9 +105,11 @@ import { getNoneDicomStudyList, setNodicomStudyState } from '@/api/trials'
 import store from '@/store'
 import pdf from '@/assets/pdf.png'
 import zip from '@/assets/zip.jpg'
+import mp4 from '@/assets/mp4.png'
 import { changeURLStatic } from '@/utils/history.js'
 import Preview from './components/preview'
 import PreviewFile from '@/components/PreviewFile'
+import FileNameSorter from "@/utils/customSort";
 // import CheckForm from './components/form'
 export default {
  name: 'Notice',
@ -110,6 +122,7 @@ export default {
    return {
      pdf,
      zip,
+      mp4,
      activeName: 'first',
      currentFileId: '',
      currentStudyIndex: 0,
@ -140,6 +153,7 @@ export default {
      isAudit: false,

      activeNames: [],
+      Asc: false
    }
  },
  async created() {
@ -156,7 +170,30 @@ export default {
    this.getNoneDicomList()
    // 默认选择第一个文件
  },
+  computed: {
+    CriterionType() {
+      return this.OtherInfo.CriterionType ? this.OtherInfo.CriterionType : 0
+    }
+  },
  methods: {
+    sortFile() {
+      if (this.Asc) {
+        this.Asc = false
+      } else {
+        this.Asc = true
+      }
+      console.log(this.Asc, 'this.Asc')
+      this.studyList.forEach(study => {
+        if (study.NoneDicomStudyFileList.length > 0) {
+          study.NoneDicomStudyFileList = FileNameSorter.sortFileNames(study.NoneDicomStudyFileList, {
+            direction: this.Asc ? 'asc' : 'desc',
+            key: 'FileName'
+          })
+        }
+      })
+      this.previewImage.imgList = this.studyList[this.currentStudyIndex].NoneDicomStudyFileList
+      this.previewImage.index = this.studyList[this.currentStudyIndex].NoneDicomStudyFileList.findIndex(item => item.Id === this.currentFileId)
+    },
    handleChange() { },
    changeReadingStatus(callback, row, file) {
      let statusStr = ''
@ -278,7 +315,8 @@ export default {
        this.studyId,
        false,
        this.$route.query.visitTaskId,
-        !!this.$route.query.isReading
+        !!this.$route.query.isReading,
+        this.$route.query.isImageSegmentLabel,
      )
        .then((res) => {
          this.studyList = res.Result
@ -289,11 +327,13 @@ export default {
            return item.NoneDicomStudyFileList.length > 0
          })
          this.activeNames = this.studyList.map((item) => item.CodeView)
-          console.log(this.activeNames)
          if (studyIndex > -1) {
            var fileObj = this.studyList[studyIndex]['NoneDicomStudyFileList']
            this.selected(fileObj[0], studyIndex, 0, true)
          }
+          if (this.CriterionType === 19 || this.CriterionType === 20) {
+            this.sortFile()
+          }
        })
        .catch(() => {
          this.loading = false
@ -306,10 +346,15 @@ export default {
        this.pdfFile.type = 'pdf'
        this.showPDF = true
        return true
+      } else if (!!~file.FileType.indexOf('mp4')) {
+        this.pdfFile.path = file.Path || file.FullFilePath
+        this.pdfFile.type = file.FileType
+        this.showPDF = true
+        return true
      } else {
        this.showPDF = false
      }
-
+      console.log(this.pdfFile)
      this.currentStudyIndex = studyIndex
      this.previewImage.imgList =
        this.studyList[studyIndex].NoneDicomStudyFileList
@ -320,12 +365,13 @@ export default {
      this.previewImage.modality = this.studyList[studyIndex].Modality
      this.$nextTick(() => {
        if (isChangeSub) {
-          this.$refs['previewImage'].selected(fileIndex)
+          this.$refs['previewImage'].selected(this.currentFileId)
        }
      })
    },
-    selectedImg(fileIndex) {
+    selectedImg(id) {
      if (this.studyList.length > 0) {
+        let fileIndex = this.studyList[this.currentStudyIndex].NoneDicomStudyFileList.findIndex(item => item.Id === id)
        this.currentStudyFileIndex = fileIndex
        this.currentFileId =
          this.studyList[this.currentStudyIndex].NoneDicomStudyFileList[
@ -353,6 +399,10 @@ export default {
 </script>

 <style lang="scss" scoped>
+.icon_check {
+  color: #409EFF;
+}
+
 .img-container {
  position: relative;
  width: 100%;
--- a/src/views/research/components/BaseInfo.vue
+++ b/src/views/research/components/BaseInfo.vue
@ -1,5 +1,6 @@
 <template>
-  <el-form v-if="isShow" ref="researchBSForm" size="small" :model="form" :rules="rules" style="width:80%">
+  <el-form v-if="isShow" ref="researchBSForm" size="small" :model="form" :rules="rules" style="width:80%"
+    label-position="left">
    <!-- 项目编号 -->
    <el-form-item :label="$t('trials:researchForm:form:trialId')">
      <el-input v-model="form.TrialCode" disabled />
@ -18,19 +19,10 @@
    </el-form-item>
    <!-- 中心名称 -->
    <el-form-item :label="$t('trials:researchForm:form:siteName')" prop="TrialSiteId">
-      <el-select
-        v-model="form.TrialSiteId"
-        filterable
-        style="width:100%;"
-        :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory"
-        @change="handleSiteChange"
-      >
-        <el-option
-          v-for="(item,index) of siteOptions"
-          :key="index"
-          :label="item.TrialSiteAliasName"
-          :value="item.TrialSiteId"
-        />
+      <el-select v-model="form.TrialSiteId" filterable style="width:100%;"
+        :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory" @change="handleSiteChange">
+        <el-option v-for="(item, index) of siteOptions" :key="index" :label="item.TrialSiteAliasName"
+          :value="item.TrialSiteId" />
      </el-select>
    </el-form-item>
    <!-- 中心编号 -->
@ -42,10 +34,7 @@
      <el-input v-model="form.UserName" :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory" />
    </el-form-item>
    <!-- 联系电话 -->
-    <el-form-item
-      :label="$t('trials:researchForm:form:contactorPhone')"
-      prop="Phone"
-    >
+    <el-form-item :label="$t('trials:researchForm:form:contactorPhone')" prop="Phone">
      <el-input v-model="form.Phone" :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory" />
    </el-form-item>
    <!-- 联系邮箱 -->
@ -55,75 +44,71 @@

    <!-- <el-divider /> -->
    <!-- 平均刻盘周期（天） -->
-    <el-form-item v-if="!notShowFieldList.includes('AverageEngravingCycle')" :label="$t('trials:researchForm:form:engravingCycle')">
-      <el-input-number v-model="form.AverageEngravingCycle" :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory" controls-position="right" :min="0" />
+    <el-form-item v-if="!notShowFieldList.includes('AverageEngravingCycle')"
+      :label="$t('trials:researchForm:form:engravingCycle')">
+      <el-input-number v-model="form.AverageEngravingCycle"
+        :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory" controls-position="right" :min="0" />
    </el-form-item>
    <!-- 请确认参与本项目影像采集的影像技师具备对应的资质（如：“技师证”，对应设备的“大型设备上岗证”） -->
-    <el-form-item v-if="!notShowFieldList.includes('IsConfirmImagingTechnologist')" :label="$t('trials:researchForm:form:isQualified')">
-      <el-radio-group v-model="form.IsConfirmImagingTechnologist" :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory">
-        <el-radio
-          v-for="item of $d.YesOrNo"
-          :key="`IsConfirmImagingTechnologist${item.value}`"
-          :label="item.value"
-        >{{ item.label }}</el-radio>
+    <el-form-item v-if="!notShowFieldList.includes('IsConfirmImagingTechnologist')"
+      :label="$t('trials:researchForm:form:isQualified')">
+      <el-radio-group v-model="form.IsConfirmImagingTechnologist"
+        :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory">
+        <el-radio v-for="item of $d.YesOrNo" :key="`IsConfirmImagingTechnologist${item.value}`" :label="item.value">{{
+          item.label }}</el-radio>
      </el-radio-group>
    </el-form-item>
    <!-- 原因 -->
-    <el-form-item
-      v-if="!notShowFieldList.includes('NotConfirmReson') && form.IsConfirmImagingTechnologist === false"
-      :label="$t('trials:researchForm:form:notQualifiedReason')"
-    >
-      <el-input
-        v-model="form.NotConfirmReson"
-        type="textarea"
-        :autosize="{ minRows: 2, maxRows: 4}"
-        :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory"
-      />
+    <el-form-item v-if="!notShowFieldList.includes('NotConfirmReson') && form.IsConfirmImagingTechnologist === false"
+      :label="$t('trials:researchForm:form:notQualifiedReason')">
+      <el-input v-model="form.NotConfirmReson" type="textarea" :autosize="{ minRows: 2, maxRows: 4 }"
+        :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory" />
    </el-form-item>
    <!-- 研究单位疗效评估人员类型 -->
-    <el-form-item v-if="!notShowFieldList.includes('EfficacyEvaluatorType')" :label="$t('trials:researchForm:form:staffType')">
-      <el-radio-group v-model="form.EfficacyEvaluatorType" :disabled="!(state === 0 && userTypeEnumInt === 0)|| isHistory">
-        <el-radio v-for="item of $d.EfficacyEvaluatorType" :key="`EfficacyEvaluatorType${item.value}`" :label="item.value">{{ item.label }}</el-radio>
+    <el-form-item v-if="!notShowFieldList.includes('EfficacyEvaluatorType')"
+      :label="$t('trials:researchForm:form:staffType')">
+      <el-radio-group v-model="form.EfficacyEvaluatorType"
+        :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory">
+        <el-radio v-for="item of $d.EfficacyEvaluatorType" :key="`EfficacyEvaluatorType${item.value}`"
+          :label="item.value">{{ item.label }}</el-radio>
      </el-radio-group>
    </el-form-item>
    <!-- 是否严格按照研究单位影像手册参数完成图像采集 -->
    <el-form-item v-if="!notShowFieldList.includes('IsFollowStudyParameters')">
      <span slot="label" v-html="$t('trials:researchForm:form:isFollowStudyParam')" />
-      <el-radio-group v-model="form.IsFollowStudyParameters" :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory">
-        <el-radio v-for="item of $d.YesOrNo" :key="`IsFollowStudyParameters${item.value}`" :label="item.value">{{ item.label }}</el-radio>
+      <el-radio-group v-model="form.IsFollowStudyParameters"
+        :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory" style="margin-right: 10px;">
+        <el-radio v-for="item of $d.YesOrNo" :key="`IsFollowStudyParameters${item.value}`" :label="item.value">{{
+          item.label }}</el-radio>
      </el-radio-group>
+      <el-button type="primary" size="small" @click="viewManual">
+        {{ $t('trials:researchForm:button:viewManual') }}
+      </el-button>
    </el-form-item>
    <!-- 不能严格按照研究单位影像手册参数采集图像原因 -->
-    <el-form-item
-      v-if="!notShowFieldList.includes('NotFollowReson') && !form.IsFollowStudyParameters"
-    >
+    <el-form-item v-if="!notShowFieldList.includes('NotFollowReson') && !form.IsFollowStudyParameters">
      <span slot="label" v-html="$t('trials:researchForm:form:notFollowStudyParam')" />
-      <el-input
-        v-model="form.NotFollowReson"
-        type="textarea"
-        :autosize="{ minRows: 2, maxRows: 4}"
-        :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory"
-      />
+      <el-input v-model="form.NotFollowReson" type="textarea" :autosize="{ minRows: 2, maxRows: 4 }"
+        :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory" />
    </el-form-item>
    <el-form-item>
      <!-- 保存 -->
-      <el-button
-        v-if="state === 0 && userTypeEnumInt === 0 && !isHistory"
-        type="primary"
-        :loading="btnLoading"
-        size="small"
-        @click="handleSave(false)"
-      >
+      <el-button v-if="state === 0 && userTypeEnumInt === 0 && !isHistory" type="primary" :loading="btnLoading"
+        size="small" @click="handleSave(false)">
        {{ $t('common:button:save') }}
      </el-button>
    </el-form-item>
+    <attachmentPreview :visible.sync="perview_visible" :isView="true" :isExternal="true" :ExternalList="ExternalList"
+      v-if="perview_visible" />
  </el-form>
 </template>
 <script>
-import { getTrialSiteSelect } from '@/api/trials'
+import { getTrialSiteSelect, getTrialDocumentList } from '@/api/trials'
 import { addOrUpdateTrialSiteSurvey } from '@/api/research'
+import attachmentPreview from '@/views/dictionary/attachment/components/SignatureTemplate/attachmentPreview'
 export default {
  name: 'QuestionForm',
+  components: { attachmentPreview },
  props: {
    isHistory: {
      type: Boolean,
@ -197,10 +182,41 @@ export default {
      state: null,
      userTypeEnumInt: zzSessionStorage.getItem('userTypeEnumInt') * 1,
      isShow: false,
-      notShowFieldList: []
+      notShowFieldList: [],
+      perview_visible: false,
+      ExternalList: []
    }
  },
  methods: {
+    async viewManual() {
+      try {
+        let data = {
+          PageIndex: 1,
+          PageSize: 20,
+          TrialId: this.$route.query.trialId,
+          IsPublish: true,
+          FileTypeCode: 4,
+          IsDeleted: false
+        }
+        let res = await getTrialDocumentList(data)
+        if (res.IsSuccess) {
+          const { CurrentPageData } = res.Result
+          if (CurrentPageData.length <= 0) return this.$message.warning(this.$t("trials:researchRecord:ImageManual:message:noImageManual"))
+          this.ExternalList = []
+          CurrentPageData.forEach(item => {
+            let obj = {
+              FilePath: item.Path,
+              FileFormat: 'pdf',
+              Name: item.Name
+            }
+            this.ExternalList.push(obj)
+          });
+          this.perview_visible = true
+        }
+      } catch (err) {
+        console.log(err)
+      }
+    },
    // 保存基本信息
    handleSave(isAutoCommit) {
      return new Promise((resolve, reject) => {
--- a/src/views/research/components/ResearchForm.vue
+++ b/src/views/research/components/ResearchForm.vue
@ -21,14 +21,15 @@
        <!-- <h4>{{ $t('trials:staffResearch:title:staff') }}</h4>-->
        <!-- 历史人员 -->
        <h4>{{ $t('trials:staffResearch:title:historicalStaff') }}</h4>
-        <HistoricalParticipant ref="historicalParticipant" :is-history="true" @refreshPage="refreshPage" @getList="initPage" />
+        <HistoricalParticipant ref="historicalParticipant" :is-history="true" @refreshPage="refreshPage"
+          @getList="initPage" />
        <!-- 新增人员 -->
        <h4>{{ $t('trials:staffResearch:title:newStaff') }}</h4>
        <ParticipantList ref="researchParticipants" :is-history="true" @refreshPage="refreshPage" @getList="initPage" />
      </el-card>

      <!-- 设备调研 -->
-      <el-card shadow="hover" class="mt10">
+      <el-card shadow="hover" class="mt10" v-if="!siteSurveyNoteInfo.IsCloseEquipmentSurvey">
        <h4>{{ $t('trials:equiptResearch:title:equiptResearch') }}</h4>
        <EquipmentList ref="researchEquipments" :is-history="true" />
      </el-card>
@ -53,31 +54,17 @@
      </el-card>
    </div>

-    <el-dialog
-      v-if="rejectVisible"
-      :visible.sync="rejectVisible"
-      :close-on-click-modal="false"
-      :title="$t('trials:researchForm:dialogTitle:reject')"
-      width="600px"
-      custom-class="base-dialog-wrapper"
-      :append-to-body="userTypeEnumInt !== 0"
-    >
+    <el-dialog v-if="rejectVisible" :visible.sync="rejectVisible" :close-on-click-modal="false"
+      :title="$t('trials:researchForm:dialogTitle:reject')" width="600px" custom-class="base-dialog-wrapper"
+      :append-to-body="userTypeEnumInt !== 0">
      <el-form ref="rejectForm" :model="rejectForm" label-width="100px">
        <div class="base-dialog-body">
          <!-- 驳回原因 -->
-          <el-form-item
-            :label="$t('trials:researchForm:form:rejectReson')"
-            prop="reason"
-            :rules="[
-              { required: true, message: $t('trials:researchForm:formRule:specify')}
-            ]"
-          >
-            <el-input
-              v-model="rejectForm.reason"
-              type="textarea"
-              :autosize="{ minRows: 2, maxRows: 4}"
-              style="width:100%;"
-            />
+          <el-form-item :label="$t('trials:researchForm:form:rejectReson')" prop="reason" :rules="[
+            { required: true, message: $t('trials:researchForm:formRule:specify') }
+          ]">
+            <el-input v-model="rejectForm.reason" type="textarea" :autosize="{ minRows: 2, maxRows: 4 }"
+              style="width:100%;" />
          </el-form-item>
        </div>
        <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
@ -136,7 +123,7 @@ export default {
  props: {
    trialSiteSurveyId: {
      type: String,
-      required: true
+      default: ''
    }
  },
  data() {
@ -152,7 +139,7 @@ export default {
      btnLoading: false,
      isFullscreen: false,
      historyVisible: false,
-      siteSurveyNoteInfo: null
+      siteSurveyNoteInfo: {}
    }
  },
  mounted() {
@ -172,6 +159,7 @@ export default {
          if (res.Result.SiteSurveyFiledConfig && res.Result.SiteSurveyFiledConfig.ModifyFiledList.length > 0) {
            this.siteSurveyNoteInfo = res.Result.SiteSurveyFiledConfig.ModifyFiledList.find(i => i.NeedModifyFiled === 'SiteSurveyNote')
          }
+          this.siteSurveyNoteInfo.IsCloseEquipmentSurvey = res.Result.SiteSurveyFiledConfig.IsCloseEquipmentSurvey
          var historicalArr = []
          var newArr = []
          res.Result.TrialSiteUserSurveyList.map(i => {
@ -241,7 +229,7 @@ export default {
            this.$message.success(this.$t('common:message:savedSuccessfully'))
          }
        }).catch(() => { this.loading = false })
-      }).catch(() => {})
+      }).catch(() => { })
    },
    // 生成账号
    generateAccount() {
@ -276,7 +264,7 @@ export default {
        }).catch(() => {
          this.loading = false
        })
-      }).catch(() => {})
+      }).catch(() => { })
    },
    // 驳回
    handleReject() {
@ -324,37 +312,44 @@ export default {
  display: flex;
  flex-direction: column;
  height: 100%;
-  .mt10{
+
+  .mt10 {
    margin-top: 10px;
  }
-  .header-wrapper{
+
+  .header-wrapper {
    width: 70%;
    margin: 20px auto;
  }
-  .center-wrapper{
+
+  .center-wrapper {
    flex: 1;
    width: 70%;
    margin: 0px auto;
    padding-bottom: 20px;
    overflow-y: auto;
  }
-  ::v-deep .el-card__body{
+
+  ::v-deep .el-card__body {
    padding: 10px;
  }
+
  // >>>.el-dialog__body{
  //   padding: 10px 20px 20px 20px;
  // }

-  ::v-deep .full-dialog-container{
-   .el-dialog__body{
+  ::v-deep .full-dialog-container {
+    .el-dialog__body {
      height: calc(100% - 80px);
    }
  }
-  ::v-deep .dialog-container{
+
+  ::v-deep .dialog-container {
    // margin-top: 50px !important;
-    width:75%;
-    height:80%;
-    .el-dialog__body{
+    width: 75%;
+    height: 80%;
+
+    .el-dialog__body {
      padding: 10px;
      height: calc(100% - 80px);
    }
--- a/src/views/research/form.vue
+++ b/src/views/research/form.vue
@ -6,61 +6,37 @@
        {{ $t('trials:researchForm:title:question') }}
      </h2>
      <!-- <TopLang style="position: fixed;top: 40px;right: 40px" /> -->
-      <div style="display: flex;justify-content: space-between;">
-        <div>{{ $t('trials:researchForm:title:researchSurveyStatus') }} <el-tag>{{ $fd('ResearchRecord', state) }}</el-tag></div>
+      <div style="display: flex;justify-content: space-between;" v-if="!isPreview">
+        <div>{{ $t('trials:researchForm:title:researchSurveyStatus') }} <el-tag>{{ $fd('ResearchRecord', state)
+        }}</el-tag></div>
        <div>
          <!-- 提交 -->
-          <el-button
-            v-if="(state === 0 && userTypeEnumInt === 0)"
-            type="primary"
-            size="small"
-            @click="handleSubmit('submit')"
-          >
+          <el-button v-if="(state === 0 && userTypeEnumInt === 0)" type="primary" size="small"
+            @click="handleSubmit('submit')">
            {{ $t('trials:researchForm:button:submit') }}
          </el-button>
          <!-- 审核通过 -->
-          <el-button
-            v-if="(state === 1 && hasPermi(['role:spm','role:cpm']))"
-            type="primary"
-            size="small"
-            @click="handleSubmit('approve')"
-          >
+          <el-button v-if="(state === 1 && hasPermi(['role:spm', 'role:cpm']))" type="primary" size="small"
+            @click="handleSubmit('approve')">
            {{ $t('trials:researchForm:button:auditPasses') }}
          </el-button>
          <!-- 审核通过 -->
-          <el-button
-            v-if="(state === 2 && hasPermi(['role:pm','role:apm']))"
-            type="primary"
-            size="small"
-            @click="generateAccount"
-          >
+          <el-button v-if="(state === 2 && hasPermi(['role:pm', 'role:apm']))" type="primary" size="small"
+            @click="generateAccount">
            {{ $t('trials:researchForm:button:auditPasses') }}
          </el-button>
          <!-- 驳回 -->
          <el-button
-            v-if="((state === 1 && hasPermi(['role:spm','role:cpm'])) || (state === 2 && hasPermi(['role:pm','role:apm'])))"
-            type="primary"
-            size="small"
-            @click="handleReject"
-          >
+            v-if="((state === 1 && hasPermi(['role:spm', 'role:cpm'])) || (state === 2 && hasPermi(['role:pm', 'role:apm'])))"
+            type="primary" size="small" @click="handleReject">
            {{ $t('trials:researchForm:button:auditRejected') }}
          </el-button>
          <!-- 历史记录 -->
-          <el-button
-            v-if="userTypeEnumInt === 0"
-            type="primary"
-            size="small"
-            @click="handleHistory"
-          >
+          <el-button v-if="userTypeEnumInt === 0" type="primary" size="small" @click="handleHistory">
            {{ $t('trials:researchForm:button:historicalRecord') }}
          </el-button>
          <!-- 退出 -->
-          <el-button
-            v-if="userTypeEnumInt === 0"
-            type="primary"
-            size="small"
-            @click="handleBack"
-          >
+          <el-button v-if="userTypeEnumInt === 0" type="primary" size="small" @click="handleBack">
            {{ $t('trials:researchForm:button:loginOut') }}
          </el-button>
        </div>
@ -69,24 +45,26 @@
    <div class="center-wrapper">
      <!-- 基本信息 -->
      <el-card shadow="hover">
-        <BaseInfo ref="baseResearchInfo" />
+        <BaseInfo ref="baseResearchInfo" :isPreview="isPreview" />
      </el-card>

      <!-- 人员调查 -->
      <el-card shadow="hover" class="mt10">
        <!-- 历史人员 -->
        <h4>{{ $t('trials:staffResearch:title:historicalStaff') }}</h4>
-        <HistoricalParticipant ref="historicalParticipant" @refreshPage="refreshPage" @getList="initPage" />
+        <HistoricalParticipant ref="historicalParticipant" :isPreview="isPreview" @refreshPage="refreshPage"
+          @getList="initPage" />
        <!-- <h4>{{ $t('trials:staffResearch:title:staff') }}</h4> -->
        <!-- 新增人员 -->
        <h4>{{ $t('trials:staffResearch:title:newStaff') }}</h4>
-        <ParticipantList ref="researchParticipants" @refreshPage="refreshPage" @getList="initPage" />
+        <ParticipantList ref="researchParticipants" :isPreview="isPreview" @refreshPage="refreshPage"
+          @getList="initPage" />
      </el-card>

      <!-- 设备调研 -->
-      <el-card shadow="hover" class="mt10">
+      <el-card shadow="hover" class="mt10" v-if="!siteSurveyNoteInfo.IsCloseEquipmentSurvey">
        <h4>{{ $t('trials:equiptResearch:title:equiptResearch') }}</h4>
-        <EquipmentList ref="researchEquipments" />
+        <EquipmentList ref="researchEquipments" :isPreview="isPreview" />
      </el-card>

      <!-- 其他信息调研 -->
@ -110,31 +88,17 @@
      </el-card>
    </div>

-    <el-dialog
-      v-if="rejectVisible"
-      :visible.sync="rejectVisible"
-      :close-on-click-modal="false"
-      :title="$t('trials:researchForm:dialogTitle:reject')"
-      width="600px"
-      custom-class="base-dialog-wrapper"
-      append-to-body
-    >
+    <el-dialog v-if="rejectVisible" :visible.sync="rejectVisible" :close-on-click-modal="false"
+      :title="$t('trials:researchForm:dialogTitle:reject')" width="600px" custom-class="base-dialog-wrapper"
+      append-to-body>
      <el-form ref="rejectForm" :model="rejectForm" label-width="100px">
        <div class="base-dialog-body">
          <!-- 驳回原因 -->
-          <el-form-item
-            :label="$t('trials:researchForm:form:rejectReson')"
-            prop="reason"
-            :rules="[
-              { required: true, message: $t('trials:researchForm:formRule:specify')}
-            ]"
-          >
-            <el-input
-              v-model="rejectForm.reason"
-              type="textarea"
-              :autosize="{ minRows: 2, maxRows: 4}"
-              style="width:100%;"
-            />
+          <el-form-item :label="$t('trials:researchForm:form:rejectReson')" prop="reason" :rules="[
+            { required: true, message: $t('trials:researchForm:formRule:specify') }
+          ]">
+            <el-input v-model="rejectForm.reason" type="textarea" :autosize="{ minRows: 2, maxRows: 4 }"
+              style="width:100%;" />
          </el-form-item>
        </div>
        <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
@ -152,30 +116,24 @@
      </el-form>
    </el-dialog>

-    <el-dialog
-      :visible.sync="historyVisible"
-      :custom-class="isFullscreen?'full-dialog-container':'dialog-container'"
-      :close-on-click-modal="false"
-      :fullscreen="isFullscreen"
-      :show-close="false"
-    >
+    <el-dialog :visible.sync="historyVisible"
+      :custom-class="isFullscreen ? 'full-dialog-container' : 'dialog-container'" :close-on-click-modal="false"
+      :fullscreen="isFullscreen" :show-close="false">
      <span slot="title" class="dialog-footer">
        <div style="display: flex;flex-direction: row;justify-content: space-between;">
          <div>
            {{ $t('trials:researchForm:button:historicalRecord') }}
          </div>
          <div>
-            <svg-icon :icon-class="isFullscreen?'exit-fullscreen':'fullscreen'" style="vertical-align: baseline;cursor: pointer;font-size: 20px;" @click="isFullscreen=!isFullscreen" />
-            <svg-icon icon-class="dClose" style="cursor: pointer;font-size: 25px;margin-left: 10px;" @click="historyVisible = false" />
+            <svg-icon :icon-class="isFullscreen ? 'exit-fullscreen' : 'fullscreen'"
+              style="vertical-align: baseline;cursor: pointer;font-size: 20px;" @click="isFullscreen = !isFullscreen" />
+            <svg-icon icon-class="dClose" style="cursor: pointer;font-size: 25px;margin-left: 10px;"
+              @click="historyVisible = false" />
          </div>
        </div>
      </span>
      <div style="height:100%;margin:0;">
-        <HistoricalRecord
-          :trial-id="trialId"
-          :site-id="siteId"
-          :trial-site-survey-id="trialSiteSurveyId"
-        />
+        <HistoricalRecord :trial-id="trialId" :site-id="siteId" :trial-site-survey-id="trialSiteSurveyId" />
      </div>
    </el-dialog>

@ -194,6 +152,12 @@ import HistoricalRecord from './components/HistoricalRecord'
 export default {
  name: 'QuestionForm',
  components: { BaseInfo, HistoricalParticipant, ParticipantList, EquipmentList, TopLang, HistoricalRecord },
+  props: {
+    isPreview: {
+      type: Boolean,
+      default: false
+    }
+  },
  data() {
    return {
      trialId: this.$route.query.trialId,
@ -208,7 +172,7 @@ export default {
      btnLoading: false,
      isFullscreen: false,
      historyVisible: false,
-      siteSurveyNoteInfo: null
+      siteSurveyNoteInfo: {}
    }
  },
  mounted() {
@ -229,6 +193,7 @@ export default {
          if (res.Result.SiteSurveyFiledConfig && res.Result.SiteSurveyFiledConfig.ModifyFiledList.length > 0) {
            this.siteSurveyNoteInfo = res.Result.SiteSurveyFiledConfig.ModifyFiledList.find(i => i.NeedModifyFiled === 'SiteSurveyNote')
          }
+          this.siteSurveyNoteInfo.IsCloseEquipmentSurvey = res.Result.SiteSurveyFiledConfig.IsCloseEquipmentSurvey
          this.state = res.Result.TrialSiteSurvey.State
          this.siteId = res.Result.TrialSiteSurvey.TrialSiteId
          this.$refs['baseResearchInfo'].initForm(res.Result.TrialInfo, res.Result.TrialSiteSurvey, res.Result.SiteSurveyFiledConfig ? res.Result.SiteSurveyFiledConfig.NotShowFieldList : null)
@ -290,7 +255,7 @@ export default {
            }
          }
        }).catch(() => { this.loading = false })
-      }).catch(() => {})
+      }).catch(() => { })
    },
    // 生成账号
    generateAccount() {
@ -325,7 +290,7 @@ export default {
        }).catch(() => {
          this.loading = false
        })
-      }).catch(() => {})
+      }).catch(() => { })
    },
    // 驳回
    handleReject() {
@ -358,7 +323,8 @@ export default {
      this.$emit('refreshPage')
    },
    // 退出
-    handleBack() {
+    async handleBack() {
+      await this.$store.dispatch('user/logout')
      this.$router.push({ path: `/researchLogin?trialId=${this.trialId}&lang=${this.$i18n.locale}` })
    },
    handleHistory() {
@ -373,37 +339,44 @@ export default {
  display: flex;
  flex-direction: column;
  height: 100%;
-  .mt10{
+
+  .mt10 {
    margin-top: 10px;
  }
-  .header-wrapper{
+
+  .header-wrapper {
    width: 70%;
    margin: 20px auto;
  }
-  .center-wrapper{
+
+  .center-wrapper {
    flex: 1;
    width: 70%;
    margin: 0px auto;
    padding-bottom: 20px;
    overflow-y: auto;
  }
-  ::v-deep.el-card__body{
+
+  ::v-deep.el-card__body {
    padding: 10px;
  }
+
  // >>>.el-dialog__body{
  //   padding: 10px 20px 20px 20px;
  // }

-  ::v-deep.full-dialog-container{
-   .el-dialog__body{
+  ::v-deep.full-dialog-container {
+    .el-dialog__body {
      height: calc(100% - 80px);
    }
  }
-  ::v-deep.dialog-container{
+
+  ::v-deep.dialog-container {
    // margin-top: 50px !important;
-    width:75%;
-    height:80%;
-    .el-dialog__body{
+    width: 75%;
+    height: 80%;
+
+    .el-dialog__body {
      padding: 10px;
      height: calc(100% - 80px);
    }
--- a/src/views/research/login.vue
+++ b/src/views/research/login.vue
@ -7,16 +7,8 @@
        <!-- <TopLang style="position: fixed;top: 40px;right: 40px" /> -->
      </h2>
      <el-card shadow="hover">
-        <el-form
-          ref="resetForm"
-          v-loading="loading"
-          :model="form"
-          label-width="150px"
-          style="width:80%;margin:0 auto;"
-          :rules="rules"
-          class="demo-ruleForm"
-          size="small"
-        >
+        <el-form ref="resetForm" v-loading="loading" :model="form" label-width="150px" style="width:80%;margin:0 auto;"
+          :rules="rules" class="demo-ruleForm" size="small">
          <!-- 项目编号 -->
          <el-form-item :label="$t('trials:researchForm:form:trialId')">
            <el-input v-model="form.TrialCode" disabled />
@ -35,13 +27,10 @@
          </el-form-item>
          <!-- 中心名称 -->
          <el-form-item :label="$t('trials:researchForm:form:siteName')" prop="TrialSiteId">
-            <el-select v-model="form.TrialSiteId" filterable style="width:100%;" @change="handleSiteChange">
-              <el-option
-                v-for="(item,index) of siteOptions"
-                :key="index"
-                :label="item.TrialSiteAliasName"
-                :value="item.TrialSiteId"
-              />
+            <el-select v-model="form.TrialSiteId" filterable style="width:100%;" @change="handleSiteChange"
+              :disabled="isUpload">
+              <el-option v-for="(item, index) of siteOptions" :key="index" :label="item.TrialSiteAliasName"
+                :value="item.TrialSiteId" />
            </el-select>
          </el-form-item>
          <!-- 中心编号 -->
@ -50,17 +39,18 @@
          </el-form-item>
          <el-form-item v-if="form.TrialSiteId && isHaveSiteSurveyRecord" label="" style="text-align:right;">
            <!-- 更新调研表 -->
-            <el-link v-if="!form.IsUpdate" type="primary" @click="form.IsUpdate = true">
+            <el-link v-if="!form.IsUpdate && isNeedUpload" type="primary" @click="form.IsUpdate = true">
              {{ $t('trials:researchForm:button:updateQsForm') }}
            </el-link>
-            <!-- 取消更新调研表 -->
-            <el-link v-else type="primary" @click="form.IsUpdate = false;form.ReplaceUserEmailOrPhone=''">
+            <!-- 取消更新调研表  form.ReplaceUserEmailOrPhone = '' -->
+            <el-link v-if="form.IsUpdate && isNeedUpload" type="primary" @click="form.IsUpdate = false;">
              {{ $t('trials:researchForm:button:cancelUpdateQsForm') }}
            </el-link>
          </el-form-item>
          <!-- 原调研表填写人邮箱 -->
-          <el-form-item v-if="form.IsUpdate" :label="$t('trials:researchForm:form:originalEmail')" prop="ReplaceUserEmailOrPhone">
-            <el-input v-model="form.ReplaceUserEmailOrPhone" autocomplete="new-password" />
+          <el-form-item v-if="form.IsUpdate" :label="$t('trials:researchForm:form:originalEmail')"
+            prop="ReplaceUserEmailOrPhone">
+            <el-input v-model="form.ReplaceUserEmailOrPhone" autocomplete="new-password" :disabled="isUpload" />
          </el-form-item>
          <!-- 联系邮箱 -->
          <el-form-item :label="$t('trials:researchForm:form:contactorEmail')" prop="EmailOrPhone">
@ -74,13 +64,9 @@
              </el-form-item>
            </el-col>
            <el-col style="width: 120px;margin-left: 10px">
-              <el-button
-                size="small"
-                type="primary"
-                style="width:100%;"
-                :disabled="sendDisabled || !form.EmailOrPhone || count > 0"
-                @click="handleSendCode"
-              >{{ this.$t('trials:researchForm:button:send') }} {{ sendTitle ? `${sendTitle}` : null }}</el-button>
+              <el-button size="small" class="codeBtn" style="width:100%;"
+                :disabled="sendDisabled || !form.EmailOrPhone || count > 0" @click="handleSendCode">{{
+                  this.$t('trials:researchForm:button:send') }} {{ sendTitle ? `${sendTitle}` : null }}</el-button>
            </el-col>
          </el-form-item>
          <el-form-item>
@ -203,7 +189,9 @@ export default {
      timer: null,
      msg: '',
      lang: 'zh',
-      isHaveSiteSurveyRecord: false
+      isHaveSiteSurveyRecord: false,
+      isUpload: false,
+      isNeedUpload: true
    }
  },
  computed: {
@ -221,6 +209,21 @@ export default {
      this.trialId = this.$route.query.trialId
      this.initPage()
    }
+    if (this.$route.query.isUpload) {
+      this.isUpload = true
+      this.form.IsUpdate = true
+      let { email, oldEMail, trialSiteId } = this.$route.query
+      if (trialSiteId) this.form.TrialSiteId = trialSiteId
+      if (oldEMail) this.form.ReplaceUserEmailOrPhone = oldEMail
+      if (email && email !== 'null') {
+        this.form.EmailOrPhone = email
+      } else {
+        this.form.EmailOrPhone = oldEMail
+      }
+      if ((email && email !== 'null') || (oldEMail && oldEMail !== 'null')) {
+        this.isNeedUpload = false
+      }
+    }
  },
  methods: {
    ...mapMutations({ setLanguage: 'lang/setLanguage' }),
@ -235,6 +238,9 @@ export default {
            this.form[key] = Result[key]
          }
        })
+        if (this.isUpload) {
+          this.handleSiteChange(this.form.TrialSiteId)
+        }
        this.loading = false
      }).catch(() => { this.loading = false })
    },
@ -265,6 +271,8 @@ export default {
            this.setLanguage(this.$route.query.lang)
            store.dispatch('user/setToken', res.Result.Token)
            zzSessionStorage.setItem('TokenKey', res.Result.Token)
+            zzSessionStorage.setItem('userId', res.Result.UserRoleId);
+            zzSessionStorage.setItem('identityUserId', res.Result.IdentityUserId);
            var permissions = await getUserPermissions()
            var menuTree = await getUserMenuTree()
            store.dispatch('user/setTree', menuTree.Result)
@ -345,8 +353,24 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.codeBtn {
+  color: #409EFF;
+  border-color: #409EFF;
+}
+
+.codeBtn.is-disabled,
+.codeBtn.is-disabled:focus,
+.codeBtn.is-disabled:hover {
+  color: #c0c4cc;
+  cursor: not-allowed;
+  background-image: none;
+  background-color: #fff;
+  border-color: #ebeef5;
+}
+
 .question-login-wrapper {
  padding: 20px;
+
  .box-wrapper {
    width: 50%;
    margin: 20px auto;
--- a/src/views/reviewers/ReviewersResearch.vue
+++ b/src/views/reviewers/ReviewersResearch.vue
@ -7,51 +7,20 @@
        {{ $t('trials:researchForm:form:title') }}
      </h2>
      <el-card shadow="hover" style="padding-top: 40px">
-        <el-form
-          ref="resetForm"
-          v-loading="loading"
-          :model="form"
-          label-width="150px"
-          style="width: 80%; margin: 0 auto"
-          :rules="rules"
-          class="demo-ruleForm"
-          size="small"
-        >
+        <el-form ref="resetForm" v-loading="loading" :model="form" label-width="150px"
+          style="width: 80%; margin: 0 auto" :rules="rules" class="demo-ruleForm" size="small">
          <!-- 联系邮箱 -->
-          <el-form-item
-            :label="$t('trials:researchForm:form:contactorEmail')"
-            prop="EmailOrPhone"
-          >
-            <el-input
-              v-model="form.EmailOrPhone"
-              autocomplete="new-password"
-              @change="handleEmailChange"
-            />
+          <el-form-item :label="$t('trials:researchForm:form:contactorEmail')" prop="EmailOrPhone">
+            <el-input v-model="form.EmailOrPhone" autocomplete="new-password" @change="handleEmailChange" />
          </el-form-item>
          <!-- 验证码 -->
-          <el-form-item
-            :label="$t('trials:researchForm:form:verifyCode')"
-            required
-          >
-            <el-col :span="20">
-              <el-form-item prop="VerificationCode">
-                <el-input
-                  v-model="form.VerificationCode"
-                  autocomplete="new-password"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-button
-                size="small"
-                type="primary"
-                style="width: 100%"
-                :disabled="sendDisabled"
-                @click="handleSendCode"
-                >{{ this.$t('trials:researchForm:button:send')
-                }}{{ count || count === 0 ? `(${count}s)` : '' }}</el-button
-              >
-            </el-col>
+          <el-form-item :label="$t('trials:researchForm:form:verifyCode')" prop="VerificationCode">
+            <div style="display: flex;;justify-content: space-between;">
+              <el-input v-model="form.VerificationCode" autocomplete="new-password" />
+              <el-button size="small" style="margin-left: 10px;" :disabled="sendDisabled" class="codeBtn"
+                @click="handleSendCode">{{ this.$t('trials:researchForm:button:send')
+                }}{{ count || count === 0 ? `(${count}s)` : '' }}</el-button>
+            </div>
          </el-form-item>
          <el-form-item>
            <!-- 取消 -->
@ -59,12 +28,7 @@
              {{ $t('common:button:cancel') }}
            </el-button>
            <!-- 提交 -->
-            <el-button
-              size="small"
-              type="primary"
-              :loading="btnLoading"
-              @click="onSubmit"
-            >
+            <el-button size="small" type="primary" :loading="btnLoading" @click="onSubmit">
              {{ $t('common:button:submit') }}
            </el-button>
          </el-form-item>
@ -216,7 +180,7 @@ export default {
    this.$i18n.locale = this.$route.query.lang
    this.setLanguage(this.$route.query.lang)
  },
-  mounted() {},
+  mounted() { },
  methods: {
    ...mapMutations({ setLanguage: 'lang/setLanguage' }),
    // 提交
@ -249,20 +213,15 @@ export default {
              // this.$router.push({ path: `/researchForm?trialId=${this.trialId}&trialSiteSurveyId=${res.Result.TrialSiteSurveyId}` })
              if (this.$route.query.trialId) {
                this.$router.push({
-                  path: `/curriculumVitae?Id=${
-                    res.Result.DoctorId ? res.Result.DoctorId : ''
-                  }&tabActive=BasicInfo&ReviewStatus=${
-                    res.Result.ReviewStatus
-                  }&trialId=${this.$route.query.trialId}&lang=${
-                    this.$route.query.lang
+                  path: `/curriculumVitae?Id=${res.Result.DoctorId ? res.Result.DoctorId : ''
+                    }&tabActive=BasicInfo&ReviewStatus=${res.Result.ReviewStatus
+                    }&trialId=${this.$route.query.trialId}&lang=${this.$route.query.lang
                    }`,
                })
              } else {
                this.$router.push({
-                  path: `/curriculumVitae?Id=${
-                    res.Result.DoctorId ? res.Result.DoctorId : ''
-                  }&tabActive=BasicInfo&ReviewStatus=${
-                    res.Result.ReviewStatus
+                  path: `/curriculumVitae?Id=${res.Result.DoctorId ? res.Result.DoctorId : ''
+                    }&tabActive=BasicInfo&ReviewStatus=${res.Result.ReviewStatus
                    }&lang=${this.$route.query.lang}`,
                })
              }
@ -312,8 +271,7 @@ export default {
        this.timer = setInterval(() => {
          if (this.count > 0 && this.count <= TIME_COUNT) {
            this.count--
-            this.sendTitle = `${this.$t('trials:researchForm:button:send')}(${
-              this.count
+            this.sendTitle = `${this.$t('trials:researchForm:button:send')}(${this.count
              }s)`
            this.sendDisabled = true
          } else {
@ -335,6 +293,7 @@ export default {
 <style lang="scss" scoped>
 .question-login-wrapper {
  padding: 20px;
+
  .box-wrapper {
    width: 50%;
    margin: 20px auto;
@ -342,4 +301,19 @@ export default {
    color: #303133;
  }
 }
+
+.codeBtn {
+  color: #409EFF;
+  border-color: #409EFF;
+}
+
+.codeBtn.is-disabled,
+.codeBtn.is-disabled:focus,
+.codeBtn.is-disabled:hover {
+  color: #c0c4cc;
+  cursor: not-allowed;
+  background-image: none;
+  background-color: #fff;
+  border-color: #ebeef5;
+}
 </style>
--- a/src/views/reviewers/curriculumVitae/components/info/clinicalTrials.vue
+++ b/src/views/reviewers/curriculumVitae/components/info/clinicalTrials.vue
@ -79,10 +79,7 @@
      <el-table-column prop="date" :label="$t('common:action:action')">
        <template
          slot-scope="scope"
-          v-if="
-            scope.row.ExperienceDataType != 2 &&
-            scope.row.ExperienceDataType != 3
-          "
+          v-if="scope.row.ExperienceDataType != 3"
        >
          <el-button
            type="text"
--- a/src/views/reviewers/curriculumVitae/index.vue
+++ b/src/views/reviewers/curriculumVitae/index.vue
@ -2,14 +2,8 @@
  <div class="curriculumVitae" v-loading="loading">
    <div class="leftMenu">
      <div class="title">{{ $t('curriculumVitae:menu:title') }}</div>
-      <el-menu
-        :default-active="activeIndex"
-        class="el-menu-demo"
-        mode="vertical"
-        @select="handleSelect"
-        background-color="#eee"
-        active-text-color="#000"
-      >
+      <el-menu :default-active="activeIndex" class="el-menu-demo" mode="vertical" @select="handleSelect"
+        background-color="#eee" active-text-color="#000">
        <el-menu-item index="info">
          {{ $t('curriculumVitae:menu:info') }}
        </el-menu-item>
@ -70,94 +64,58 @@
            </el-button>
          </div>
        </div>
+        <!--个人信息-->
        <div class="box" id="info">
-          <info
-            :DATA="{
+          <info :DATA="{
            ...reviewerData.BasicInfoView,
            ...reviewerData.EmploymentView,
-            }"
-            :reviewerId.sync="reviewerId"
-            :isEN="isEN"
-            @getInfo="getDetail"
-          />
+          }" :reviewerId.sync="reviewerId" :isEN="isEN" @getInfo="getDetail" />
        </div>
+        <!--概述-->
        <div class="box" id="summarize">
-          <summarize
-            :DATA="{
+          <summarize :DATA="{
            ...reviewerData.SummarizeInfo,
-            }"
-            :reviewerId.sync="reviewerId"
-            :trialId="trialId"
-            :isEN="isEN"
-            @getInfo="getDetail"
-          />
+          }" :reviewerId.sync="reviewerId" :trialId="trialId" :isEN="isEN" @getInfo="getDetail" />
        </div>
+        <!--专业-->
        <div class="box" id="specialty">
-          <specialty
-            :DATA="{
+          <specialty :DATA="{
            ...reviewerData.SpecialtyView,
-            }"
-            :isEN="isEN"
-            :reviewerId.sync="reviewerId"
-            @getInfo="getDetail"
-          />
+          }" :isEN="isEN" :reviewerId.sync="reviewerId" @getInfo="getDetail" />
        </div>
+        <!--教育经历-->
        <div class="box" id="educationalExperience">
-          <educationalExperience
-            :DATA="reviewerData.EducationList"
-            :isEN="isEN"
-            :reviewerId.sync="reviewerId"
-            @getInfo="getDetail"
-          />
+          <educationalExperience :DATA="reviewerData.EducationList" :isEN="isEN" :reviewerId.sync="reviewerId"
+            @getInfo="getDetail" />
        </div>
+        <!--进修培训-->
        <div class="box" id="continuingTraining">
-          <continuingTraining
-            :DATA="reviewerData.PostgraduateList"
-            :isEN="isEN"
-            :reviewerId.sync="reviewerId"
-            @getInfo="getDetail"
-          />
+          <continuingTraining :DATA="reviewerData.PostgraduateList" :isEN="isEN" :reviewerId.sync="reviewerId"
+            @getInfo="getDetail" />
        </div>
+        <!--科研课题-->
        <div class="box" id="scientificResearchProject">
-          <scientificResearchProject
-            :DATA="{ ...reviewerData.ResearchPublicationView }"
-            :isEN="isEN"
-            :reviewerId.sync="reviewerId"
-            @getInfo="getDetail"
-          />
+          <scientificResearchProject :DATA="{ ...reviewerData.ResearchPublicationView }" :isEN="isEN"
+            :reviewerId.sync="reviewerId" @getInfo="getDetail" />
        </div>
+        <!--临床试验-->
        <div class="box" id="clinicalTrials">
-          <clinicalTrials
-            :DATA="{ ...reviewerData.TrialExperienceView }"
-            :isEN="isEN"
-            :reviewerId.sync="reviewerId"
-            :trialId="trialId"
-            @getInfo="getDetail"
-          />
+          <clinicalTrials :DATA="{ ...reviewerData.TrialExperienceView }" :isEN="isEN" :reviewerId.sync="reviewerId"
+            :trialId="trialId" @getInfo="getDetail" />
        </div>
+        <!--gcp证书-->
        <div class="box" id="treatise">
-          <treatise
-            :DATA="{ ...reviewerData.ResearchPublicationView }"
-            :isEN="isEN"
-            :reviewerId.sync="reviewerId"
-            @getInfo="getDetail"
-          />
+          <treatise :DATA="{ ...reviewerData.ResearchPublicationView }" :isEN="isEN" :reviewerId.sync="reviewerId"
+            @getInfo="getDetail" />
        </div>
+        <!--其他相关经历-->
        <div class="box" id="other">
-          <other
-            :DATA="{ ...reviewerData.ResearchPublicationView }"
-            :isEN="isEN"
-            :reviewerId.sync="reviewerId"
-            @getInfo="getDetail"
-          />
+          <other :DATA="{ ...reviewerData.ResearchPublicationView }" :isEN="isEN" :reviewerId.sync="reviewerId"
+            @getInfo="getDetail" />
        </div>
        <div class="box" id="pay">
-          <pay
-            :DATA="{ ...reviewerData.PaymentModeInfo }"
-            :isEN="isEN"
-            :reviewerId.sync="reviewerId"
-            @getInfo="getDetail"
-          />
+          <pay :DATA="{ ...reviewerData.PaymentModeInfo }" :isEN="isEN" :reviewerId.sync="reviewerId"
+            @getInfo="getDetail" />
        </div>
        <div class="box" id="setting" v-if="isPM">
          <setting :isEN="isEN" :reviewerId.sync="reviewerId" />
@ -167,38 +125,19 @@
        <!--简历附件-->
        <curriculum :isEN="isEN" :reviewerId.sync="reviewerId" />
        <!--资历证书-->
-        <certificate
-          :DATA="reviewerData.AttachmentList"
-          :isEN="isEN"
-          :reviewerId.sync="reviewerId"
-          @getInfo="getDetail"
-        />
+        <certificate :DATA="reviewerData.AttachmentList" :isEN="isEN" :reviewerId.sync="reviewerId"
+          @getInfo="getDetail" />
        <!--协议-->
-        <agreement
-          :DATA="reviewerData.AttachmentList"
-          :isEN="isEN"
-          :isPM="isPM"
-          :reviewerId.sync="reviewerId"
-          @getInfo="getDetail"
-        />
+        <agreement :DATA="reviewerData.AttachmentList" :isEN="isEN" :isPM="isPM" :reviewerId.sync="reviewerId"
+          @getInfo="getDetail" />
      </div>
    </div>
    <el-dialog :visible.sync="visible" fullscreen append-to-body>
      <div style="height: 100%; overflow: auto">
-        <preview
-          :isEN="isEN"
-          :reviewerId.sync="reviewerId"
-          :trialId="trialId"
-          :isAll="isAll"
-          v-if="visible"
-        />
+        <preview :isEN="isEN" :reviewerId.sync="reviewerId" :trialId="trialId" :isAll="isAll" v-if="visible" />
      </div>
    </el-dialog>
-    <holiday
-      v-if="holidayVisible"
-      :reviewerId.sync="reviewerId"
-      :visible.sync="holidayVisible"
-    />
+    <holiday v-if="holidayVisible" :reviewerId.sync="reviewerId" :visible.sync="holidayVisible" />
    <!-- <setting
      v-if="settingVisible"
      :reviewerId.sync="reviewerId"
@ -383,12 +322,14 @@ export default {
  position: relative;
  height: 100%;
 }
+
 .title {
  line-height: 50px;
  background-color: #fff;
  text-align: center;
  font-weight: bold;
 }
+
 .leftMenu {
  position: absolute;
  left: 0;
@ -397,12 +338,15 @@ export default {
  height: 100%;
  background-color: #eee;
  border-right: 1px solid #eee;
+
  ::v-deep .el-menu {
    padding: 5px 5px 0;
  }
+
  ::v-deep .is-active {
    background-color: #fff !important;
    position: relative;
+
    &::before {
      display: block;
      content: '';
@ -415,6 +359,7 @@ export default {
    }
  }
 }
+
 .main {
  width: calc(100% - 300px);
  height: 100%;
@ -423,9 +368,11 @@ export default {
  display: flex;
  align-items: flex-start;
 }
+
 .content {
  width: calc(100% - 300px);
  padding: 0 50px 0 20px;
+
  .title {
    line-height: 50px;
    background-color: #fff;
@ -434,35 +381,42 @@ export default {
    justify-content: space-between;
  }
 }
+
 .box {
  border: 1px solid #ddd;
  border-radius: 3px;
  padding: 15px;
  margin-bottom: 20px;
 }
+
 ::v-deep .noData {
  color: #909399;
  text-align: center;
 }
+
 .rightFile {
  width: 300px;
  padding-right: 10px;
+
  ::v-deep .title {
    line-height: 50px;
    background-color: #fff;
    text-align: left;
    font-weight: bold;
  }
+
  ::v-deep .fileBox {
    background-color: #eee;
    padding: 10px;
    font-size: 14px;
    border-radius: 3px;
  }
+
  ::v-deep .file_title {
    line-height: 40px;
    font-weight: bold;
  }
+
  ::v-deep .btnBox {
    display: flex;
    align-items: center;
@ -474,17 +428,23 @@ export default {
    width: 100%;
    display: flex;
    margin-bottom: 10px;
+
    .name {
      width: 70%;
-      white-space: nowrap; /* 文本不会换行，会在同一行内继续，直到遇到<br>标签为止 */
-      text-overflow: ellipsis; /* 当文本溢出包含它的容器时，显示省略号(...)来表示被截断的文本 */
-      overflow: hidden; /* 隐藏溢出容器的文本 */
+      white-space: nowrap;
+      /* 文本不会换行，会在同一行内继续，直到遇到<br>标签为止 */
+      text-overflow: ellipsis;
+      /* 当文本溢出包含它的容器时，显示省略号(...)来表示被截断的文本 */
+      overflow: hidden;
+      /* 隐藏溢出容器的文本 */
    }
+
    i {
      cursor: pointer;
      margin: 3px;
      color: #409eff;
    }
+
    .disable {
      cursor: not-allowed;
      color: #909399;
--- a/src/views/reviewers/index.vue
+++ b/src/views/reviewers/index.vue
@ -712,11 +712,12 @@ export default {
            this.model_cfg.visible = false
            this.model_cfg.showClose = true
            console.log(res.Result)
-            for (let i = 0; res.Result.length > i; i++) {
-              let item = res.Result[i]
-              console.log(item)
-              await this.handleBatchDown(item)
-            }
+            this.downloadAllInOneZip(res.Result)
+            // for (let i = 0; res.Result.length > i; i++) {
+            //   let item = res.Result[i]
+            //   console.log(item)
+            //   await this.handleBatchDown(item)
+            // }
          } catch (e) {
            console.log(e)
          }
@ -736,6 +737,54 @@ export default {
      //   this.model_cfg.showClose = true
      // })
    },
+    async downloadAllInOneZip(arr) {
+      if (!arr.length) {
+        return
+      }
+      const zip = new JSZip()
+      const allTasks = []
+      arr.forEach((reviewer) => {
+        if (!reviewer?.FileList?.length) return
+        
+        reviewer.FileList.forEach((fileItem) => {
+          const fileUrl = this.OSSclientConfig.basePath + fileItem.Path
+          const zipPath = `${reviewer.Name}_${fileItem.FileName}`
+
+          const task = this.getFileData(fileUrl)
+            .then((response) => {
+              zip.file(zipPath, response.data, { binary: true })
+            })
+            .catch((err) => {
+              console.error(`文件下载失败 [${zipPath}]:`, err)
+            });
+          allTasks.push(task)
+        })
+      })
+
+      if (allTasks.length === 0) {
+        console.log('无可下载的文件')
+        return
+      }
+
+      try {
+        await Promise.all(allTasks)
+        
+        // 生成 ZIP
+        const zipBlob = await zip.generateAsync({
+          type: 'blob',
+          compression: 'DEFLATE',
+          compressionOptions: { level: 9 },
+        })
+
+        // 下载
+        saveAs(zipBlob, `CV_${new Date().getTime()}.zip`)
+        
+        console.error('ZIP 生成成功')
+      } catch (err) {
+        console.error('ZIP 生成失败:', err)
+      } finally {
+      }
+    },
    // 查询
    handleSelectSearch() {
      this.searchData.PageIndex = 1
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1762494352859" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="22987" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M896 832a128 128 0 0 1-128 128H256a128 128 0 0 1-128-128V192a128 128 0 0 1 128-128h512a128 128 0 0 1 128 128v640zM192 768v64a64 64 0 0 0 56.512 63.552L256 896h512a64 64 0 0 0 63.552-56.512L832 832v-64H192z m448-640H512v206.912l64-38.4 64 38.464V128z m-448 576h640V192a64 64 0 0 0-56.512-63.552L768 128h-64v263.488a32 32 0 0 1-48.448 27.456L576 371.2l-79.552 47.744A32 32 0 0 1 448 391.424V128H256a64 64 0 0 0-63.552 56.512L192 192v512z" fill="#e6e6e6" p-id="22988"></path></svg>