1

添加影像指控风险配置字段
2026-01-29 11:38:33 +08:00 · 2026-01-28 17:48:45 +08:00 · 2026-01-28 16:10:54 +08:00 · 2026-01-28 15:11:23 +08:00 · 2026-01-28 13:22:11 +08:00 · 2026-01-28 10:58:18 +08:00
211 changed files with 23689 additions and 12462 deletions
--- a/package.json
+++ b/package.json
@ -20,6 +20,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
+    <div v-show="show" v-if="$route.matched.length > 0" v-adaptive @click="openI18n" style="
      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
+    <el-drawer :title="$t('il8n:title')" :visible.sync="drawer" direction="rtl" size="80%">
      :title="$t('il8n:title')"
      :visible.sync="drawer"
      direction="rtl"
      size="80%"
    >
      <div style="width: 800px">
-        <el-form
+        <el-form label-width="100px" @submit.native.prevent size="small" :inline="true" class="demo-form-inline">
          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
+            <el-select v-model="State" clearable filterable @change="handleStateChange">
-              v-model="State"
+              <el-option v-for="item of $d.InternationalizationKeyState"
-              clearable
+                :key="'InternationalizationKeyState' + item.value" :label="item.label" :value="item.value" />
              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
+      <el-table :data="tableData" v-adaptive="{ bottomOffset: 50 }" height="100" style="width: 100%"
-        :data="tableData"
+        @sort-change="handleSortByColumn">
-        v-adaptive="{ bottomOffset: 50 }"
+        <el-table-column prop="Code" :label="$t('il8n:table:label')" width="300" show-overflow-tooltip
-        height="100"
+          sortable="custom">
        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
+        <el-table-column prop="Value" :label="$t('il8n:table:en')" sortable="custom">
          prop="Value"
          :label="$t('il8n:table:en')"
          sortable="custom"
        >
          <template slot-scope="scope">
-            <el-input
+            <el-input v-model="scope.row.Value" @input="
-              v-model="scope.row.Value"
+              (e) => {
-              @input="
+                $set(scope.row, 'Value', e)
-                (e) => {
+              }
-                  $set(scope.row, 'Value', e)
+            " size="mini"></el-input>
                }
              "
              size="mini"
            ></el-input>
          </template>
        </el-table-column>
-        <el-table-column
+        <el-table-column prop="ValueCN" :label="$t('il8n:table:cn')" sortable="custom">
          prop="ValueCN"
          :label="$t('il8n:table:cn')"
          sortable="custom"
        >
          <template slot-scope="scope">
-            <el-input
+            <el-input v-model="scope.row.ValueCN" @input="
-              v-model="scope.row.ValueCN"
+              (e) => {
-              @input="
+                $set(scope.row, 'ValueCN', e)
-                (e) => {
+              }
-                  $set(scope.row, 'ValueCN', e)
+            " size="mini"></el-input>
                }
              "
              size="mini"
            ></el-input>
          </template>
        </el-table-column>
-        <el-table-column
+        <el-table-column prop="ValueCN" :label="$t('il8n:table:state')" sortable="custom">
          prop="ValueCN"
          :label="$t('il8n:table:state')"
          sortable="custom"
        >
          <template slot-scope="scope">
-            <el-select
+            <el-select v-model="scope.row.State" clearable filterable size="mini">
-              v-model="scope.row.State"
+              <el-option v-for="item of $d.InternationalizationKeyState"
-              clearable
+                :key="'InternationalizationKeyState' + item.value" :label="item.label" :value="item.value" />
              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
+        <el-table-column prop="Version" :label="$t('il8n:table:Version')" sortable="custom">
          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"
+        <el-button size="mini" @click="drawer = false">{{ $t('common:button:cancel') }}
          >{{ $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,12 @@ 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 +112,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 +299,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 +317,7 @@ $light_gray: #606266;
    display: block;
  }
 }
 input::-webkit-outer-spin-button,
 input::-webkit-inner-spin-button {
  -webkit-appearance: none !important;
@ -393,6 +330,7 @@ input[type='number'] {
 .viewer-fixed.viewer-container {
  z-index: 10000;
 }
 textarea {
  white-space: break-spaces;
  word-break: normal;
@ -401,12 +339,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 +356,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
@ -350,3 +350,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,7 +239,7 @@ export function getPatientList_Export(data) {
    data
  })
 }
-export function getTumor_CDISC_Export(data) {
+export function getTumor_CDISC_IVUSOCT_Export(data) {
  return requestDownload({
    url: `/IVUS_OCTExport/getTumor_CDISC_Export`,
    responseType: 'blob',
@ -263,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
@ -295,6 +295,22 @@ export function readingImport(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({
--- 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}`,
+    url: `/TrialSiteSurvey/getSiteSurveyInfo/${trialId}`,
-    method: 'get'
+    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
  })
@ -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,7 +4318,103 @@ 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({
@ -4291,3 +4423,11 @@ export function getTrialSubjectVisitMarkList(data) {
    data
  })
 }
 // 更新缩略图
 export function updateImageResizePath(data) {
  return request({
    url: `/Series/updateImageResizePath`,
    method: 'post',
    data
  })
 }
--- 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-if="item.redirect==='noRedirect'||index==levelList.length-1" class="no-redirect">
-        <span v-else-if="item.name === 'TrialsPanel'" class="no-redirect">{{ item.meta.title }}</span>
+          <!-- {{ item.meta.title }} -->
-        <a v-else @click.prevent="handleLink(item)">{{ item.meta.title }}</a>
+            {{ 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
+  <el-dialog v-if="visible" :visible.sync="visible" width="540px" :close-on-click-modal="false" append-to-body center
-    v-if="visible"
+    :show-close="status === 'login'" @close="cancel">
    :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
+    <el-form ref="mfaForm" label-position="right" :model="form" :rules="rules" label-width="100px">
      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
+        <div style="display: flex;justify-content: space-between;width: 90%;">
-          :placeholder="$t('mfa:form:input:placeholder:Codes')"
+          <el-input :placeholder="$t('mfa:form:input:placeholder:Codes')" v-model="form.Code" />
-          v-model="form.Code"
+          <el-button size="small" @click.stop="sendMFACode" :disabled="flag || sendFlag" style="margin-left: 10px;"
-          style="width: 240px; margin-right: 10px"
+            class="codeBtn">{{
-        />
+              flag ?
-        <el-button
+                `${$t("mfa:form:sendMFACodeCountDown")} (${second}s)` : $t("mfa:form:sendMFACode") }}</el-button>
-          type="primary"
+        </div>
          size="small"
          @click.stop="sendMFACode"
          :disabled="flag || sendFlag"
          >{{ flag ? `${second}s` : $t("mfa:form:sendMFACode") }}</el-button
        >
      </el-form-item>
    </el-form>
    <div slot="footer">
@ -51,19 +32,16 @@
        {{ $t("mfa:button:cancel") }}
      </el-button> -->
      <!-- 保存 -->
-      <el-button
+      <el-button type="primary" size="small" @click="save" :loading="loading" style="width: 80%">
        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/PreviewFile/index.vue
+++ b/src/components/PreviewFile/index.vue
@ -54,7 +54,7 @@ export default {
      currentUser: zzSessionStorage.getItem('userName'),
      COMPANY: process.env.VUE_APP_COMPANY_NAME,
      onlyOffice_url: process.env.VUE_APP_ONLYOFFICE_URL,
-      window
+      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">
+      <template v-for="item of trialsRouter.children.find(v => { return v.name == 'TrialsPanel' }).children">
-        <el-tabs v-if="!item.tabHiddn" v-model="trialsTabChild" @tab-click="clickTab" style="background-color: #f5f7fa;">
+        <el-tab-pane :key="`tab${item.path}`"
-          <template v-for="item1 of item.children">
+          :disabled="TotalNeedSignTrialDocCount !== 0 && item.path !== '/trials/trials-panel/attachments'"
-            <el-tab-pane
+          :label="$t(item.LanguageMark)" :name="item.path" v-if="isShowNode(item)">
-              v-if="TrialConfig && isShow(item1.path)"
+          <el-tabs v-if="!item.tabHiddn" v-model="trialsTabChild" @tab-click="clickTab"
-              :key="`tab1${item1.path}`"
+            style="background-color: #f5f7fa;">
-              :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'))"
+            <template v-for="item1 of item.children">
-              :label="$t(item1.LanguageMark)"
+              <el-tab-pane v-if="TrialConfig && isShow(item1.path)" :key="`tab1${item1.path}`"
-              :name="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" />
-          </template>
+            </template>
-        </el-tabs>
+          </el-tabs>
-      </el-tab-pane>
+        </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 />
@ -83,7 +85,7 @@ export default {
      getUserDocumentList({ TrialId: this.$route.query.trialId }).then(async res => {
        var total = res.OtherInfo.NeedSignCount
        var TrialStatusStr = res.OtherInfo.TrialStatusStr
-        this.IsAdditionalAssessment   = res.OtherInfo.IsAdditionalAssessment
+        this.IsAdditionalAssessment = res.OtherInfo.IsAdditionalAssessment
        this.TrialStatusStr = TrialStatusStr
        await store.dispatch('user/setTotalNeedSignTrialDocCount', total)
        await store.dispatch('user/setTrialStatusStr', TrialStatusStr)
@ -100,7 +102,7 @@ export default {
    getUserDocumentList({ TrialId: this.$route.query.trialId }).then(async res => {
      var total = res.OtherInfo.NeedSignCount
      var TrialStatusStr = res.OtherInfo.TrialStatusStr
-      this.IsAdditionalAssessment   = res.OtherInfo.IsAdditionalAssessment
+      this.IsAdditionalAssessment = res.OtherInfo.IsAdditionalAssessment
      this.TrialStatusStr = TrialStatusStr
      await store.dispatch('user/setTotalNeedSignTrialDocCount', total)
      await store.dispatch('user/setTrialStatusStr', TrialStatusStr)
@ -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{
+.trialsTab {
-    .my_icon_box{
+  .my_icon_box {
-      padding:0 20px 0 0;
+    padding: 0 20px 0 0;
-      transition: color,transform .3s;
+    transition: color, transform .3s;
-      cursor: pointer;
+    cursor: pointer;
-      color: #666;
+    color: #666;
-      display: flex;
+    display: flex;
-      justify-content: center;
+    justify-content: center;
-      align-items: center;
+    align-items: center;
-      &:hover{
+
-        color: #428bca;
+    &:hover {
-      }
+      color: #428bca;
      span{
        margin-left: 3px;
        font-size: 14px;
      }
    }
-    .el-tabs__header{
+
-      margin-bottom: 3px;
+    span {
-    }
+      margin-left: 3px;
-    .el-tabs__item.is-active{
+      font-size: 14px;
      font-weight: bold;
    }
    position: relative;
    .el-input--medium .el-input__inner{
      height: 44px;line-height: 44px;width: 280px;
      border: none;
      text-align: right;
    }
  }
-  .base-model-wrapper{
+
-    .el-dialog__header{
+  .el-tabs__header {
-      padding: 10px;
+    margin-bottom: 3px;
-      .el-dialog__headerbtn{
+  }
-        top: 10px;
+
-        right: 10px;
+  .el-tabs__item.is-active {
-      }
+    font-weight: bold;
-    }
+  }
-    .el-dialog__body{
+
-      padding:10px 10px 10px 10px;
+  position: relative;
-      .base-modal-body{
+
-        min-height: 100px;
+  .el-input--medium .el-input__inner {
-        max-height:650px;
+    height: 44px;
-        overflow-y: auto;
+    line-height: 44px;
-        padding: 10px;
+    width: 280px;
-        border: 1px solid #e0e0e0;
+    border: none;
-      }
+    text-align: right;
-    }
+  }
-    .el-dialog__footer{
+}
-      padding: 10px;
+
 .base-model-wrapper {
  .el-dialog__header {
    padding: 10px;
    .el-dialog__headerbtn {
      top: 10px;
      right: 10px;
    }
  }
  .el-dialog__body {
    padding: 10px 10px 10px 10px;
    .base-modal-body {
      min-height: 100px;
      max-height: 650px;
      overflow-y: auto;
      padding: 10px;
      border: 1px solid #e0e0e0;
    }
  }
  .el-dialog__footer {
    padding: 10px;
  }
 }
 </style>
--- a/src/components/readingChart/index.vue
+++ b/src/components/readingChart/index.vue
@ -8,7 +8,6 @@
 <script>
 import { getReportsChartData } from "@/api/reading"
 import moment from "moment"
 let echarts = require('echarts/lib/echarts');
 // 按需引入图表
--- a/src/components/timeTag/index.vue
+++ b/src/components/timeTag/index.vue
@ -0,0 +1,116 @@
 <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'
        }
    },
    created() {
        this.getTime()
    },
    async mounted() {
        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
        }
    }
 }
 </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
@ -753,6 +753,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,
@ -865,6 +872,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,
@ -905,6 +915,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'),
@ -1136,6 +1160,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 = []
@ -1178,6 +1209,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++
@ -1275,6 +1320,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)
@ -1323,6 +1382,9 @@ export default {
                  bodyPartExamined: dicomInfo.bodyPart,
                  instanceList: instanceList,
                  ImageResizePath: ImageResizePath,
                  RadiopharmaceuticalInformationSequence: v.RadiopharmaceuticalInformationSequence,
                  AcquisitionDate: v.AcquisitionDate,
                })
              }
              let text = JSON.stringify(Record)
--- 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/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/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/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`
--- 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/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"
                        /> -->
-                        <img class="image-preview" :src="item.previewImageUrl" crossorigin="anonymous" alt=""
+                        <div class="imageBox" style="width: 72px;height:72px;">
-                          style="width: 72px;height:72px;" fit="fill">
+                          <img class="image-preview" :src="item.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 style="padding: 1px 5px 1px 1px;display: flex;justify-content: space-between;">
                            <div v-if="item.keySeries" style="color:red">
@ -83,33 +87,36 @@
                            {{ item.description }}
                          </div>
                          <div v-if="!item.keySeries" style="padding: 1px;">
-                            {{ item.imageloadedArr.length }}/{{ item.instanceCount }}
+                            {{ item.imageloadedArr.length <= item.instanceCount ? item.imageloadedArr.length :
                              item.instanceCount }}/{{ item.instanceCount }} </div>
                          </div>
                        </div>
-                      </div>
+                        <div v-if="showDelete" style="display: flex;flex-direction: row;justify-content: space-between;"
-                      <div v-if="showDelete" style="display: flex;flex-direction: row;justify-content: space-between;"
+                          @click.stop="">
                        @click.stop="">
-                        <div>
+                          <div>
-                          <span style="font-size: 12px;margin-right: 5px">{{ $t('trials:audit:table:isReading')
+                            <span style="font-size: 12px;margin-right: 5px">{{ $t('trials:audit:table:isReading')
-                          }}</span>
+                            }}</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)" />
                          </div>
                        </div>
-                        <div>
+                        <div
-                          <span style="font-size: 12px;margin-right: 5px">{{ $t('trials:audit:table:isDelete') }}</span>
+                          v-if="item.prefetchInstanceCount > 0 && item.prefetchInstanceCount < item.instanceCount * 100">
-                          <el-switch v-model="item.isDeleted" size="mini" @change="changeDeleteStatus($event, item)" />
+                          <el-progress
                            :percentage="parseInt((item.prefetchInstanceCount / item.instanceCount).toFixed(2))" />
                        </div>
                      </div>
                      <div
                        v-if="item.prefetchInstanceCount > 0 && item.prefetchInstanceCount < item.instanceCount * 100">
                        <el-progress
                          :percentage="parseInt((item.prefetchInstanceCount / item.instanceCount).toFixed(2))" />
                      </div>
                      </div>
                    </div>
                  </div>
                </div>
              </el-tab-pane>
            </el-tabs>
          </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">
-                            <img class="image-preview" :src="series.previewImageUrl" crossorigin="anonymous" alt=""
+                            <div class="imageBox" style="width: 72px;height:72px;">
-                              style="width: 85px;height:85px;" fit="fill">
+                              <img class="image-preview" :src="series.previewImageUrl" crossorigin="anonymous" alt=""
                                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,35 +117,35 @@
                                </div>
                              </el-tooltip>
                              <div style="padding: 1px;">
-                                {{ series.imageloadedArr.length }}/{{ series.instanceCount }}
+                                {{ series.imageloadedArr.length <= series.instanceCount ? series.imageloadedArr.length :
                                  series.instanceCount }}/{{ series.instanceCount }} </div>
                                  <div />
                              </div>
                              <div />
                            </div>
-                          </div>
+                            <div v-if="showDelete"
-                          <div v-if="showDelete"
+                              style="display: flex;flex-direction: row;justify-content: space-between;" @click.stop="">
                            style="display: flex;flex-direction: row;justify-content: space-between;" @click.stop="">
-                            <div>
+                              <div>
-                              <span style="font-size: 12px;">{{ $t('trials:audit:table:isReading') }}</span>
+                                <span style="font-size: 12px;">{{ $t('trials:audit:table:isReading') }}</span>
-                              <el-switch v-model="series.isReading" size="mini"
+                                <el-switch v-model="series.isReading" size="mini"
-                                @change="changeReadingStatus($event, series)" />
+                                  @change="changeReadingStatus($event, series)" />
                              </div>
                              <div>
                                <span style="font-size: 12px;">{{ $t('trials:audit:table:isDelete') }}</span>
                                <el-switch v-model="series.isDeleted" size="mini"
                                  @change="changeDeleteStatus($event, series)" />
                              </div>
                            </div>
-                            <div>
+                            <!-- <div style="position: absolute;bottom: -10px;left: 0;width: 100%;">
                              <span style="font-size: 12px;">{{ $t('trials:audit:table:isDelete') }}</span>
                              <el-switch v-model="series.isDeleted" size="mini"
                                @change="changeDeleteStatus($event, series)" />
                            </div>
                          </div>
                          <!-- <div style="position: absolute;bottom: -10px;left: 0;width: 100%;">
                          <el-progress v-if="series.prefetchInstanceCount>0 && series.prefetchInstanceCount<series.instanceCount" :percentage="Number(series.prefetchInstanceCount/series.instanceCount)*100" />
                        </div> -->
-                          <div
+                            <div
-                            v-if="series.prefetchInstanceCount > 0 && series.prefetchInstanceCount < series.instanceCount * 100">
+                              v-if="series.prefetchInstanceCount > 0 && series.prefetchInstanceCount < series.instanceCount * 100">
-                            <el-progress
+                              <el-progress
-                              :percentage="parseInt((series.prefetchInstanceCount / series.instanceCount).toFixed(2))" />
+                                :percentage="parseInt((series.prefetchInstanceCount / series.instanceCount).toFixed(2))" />
-                          </div>
+                            </div>
-                        </div>
+                          </div>
                      </el-collapse-item>
                    </el-collapse>
@ -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"
+                                    <div class="imageBox" style="width: 72px;height:72px;">
-                                      alt="" style="width: 85px;height:85px;" fit="fill">
+                                      <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,6 +366,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 getStudiesInfo() {
      this.studyList = []
@ -940,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-search" @click="handleQuery">
-        <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>
+          {{ $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="Identification" :label="$t('audit:label:identification')" :show-overflow-tooltip="true" min-width="200px" />
-      <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="OptTypeValueCN" :label="$t('audit:label:optType')" show-overflow-tooltip 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="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-if="scope.row.IsEnable" size="success">启用</el-tag>
-          <el-tag v-else size="danger">禁用</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>
+            type="text" @click="handleUpMove(scope.row)"
-          <el-button type="text" @click="handleUpdate(scope.row)">修改</el-button>
+          >
            {{ $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>
+            type="text" @click="handleCopy(scope.row)">
-          <el-button type="text" @click="handleDelete(scope.row)">删除</el-button>
+            {{ $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-form-item :label="$t('dic:all:label:group')">
-          <el-select v-model="searchData.ConfigTypeId" placeholder="字典分组" clearable size="small">
+          <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="ValueCN" :label="$t('dic:all:label:valueCN')" 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="Value" :label="$t('dic:all:label:valueEN')" 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="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 :disabled="btnLoading" size="small" type="primary" @click="handleCancle">
-      <el-button size="small" type="primary" :loading="btnLoading" @click="handleSave">Save</el-button>
+        {{ $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 :disabled="btnLoading" size="small" type="primary" @click="handleCancle">
-      <el-button size="small" type="primary" :loading="btnLoading" @click="handleSave">Save</el-button>
+        {{ $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' }],
+        Code: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }],
-        DataTypeEnum: [{ required: true, message: 'Please 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-form-item :label="$t('dic:all:label:group')">
-          <el-select v-model="searchData.ConfigTypeId" placeholder="字典分组" clearable size="small">
+          <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 :disabled="btnLoading" size="small" type="primary" @click="handleCancle">
-      <el-button size="small" type="primary" :loading="btnLoading" @click="handleSave">Save</el-button>
+        {{ $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' }],
+        Code: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }],
-        DataTypeEnum: [{ required: true, message: 'Please 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-form-item :label="$t('dic:all:label:group')">
-          <el-select v-model="searchData.ConfigTypeId" placeholder="字典分组" clearable size="small">
+          <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 :disabled="btnLoading" size="small" type="primary" @click="handleCancle">
-      <el-button size="small" type="primary" :loading="btnLoading" @click="handleSave">Save</el-button>
+        {{ $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();
@ -64,18 +84,18 @@ export default {
      (s = ua.match(/rv:([\d.]+)\) like gecko/))
        ? (Sys.ie = s[1])
        : (s = ua.match(/msie ([\d\.]+)/))
-        ? (Sys.ie = s[1])
+          ? (Sys.ie = s[1])
-        : (s = ua.match(/edg\/([\d\.]+)/) || ua.match(/edge\/([\d\.]+)/))
+          : (s = ua.match(/edg\/([\d\.]+)/) || ua.match(/edge\/([\d\.]+)/))
-        ? (Sys.edge = s[1])
+            ? (Sys.edge = s[1])
-        : (s = ua.match(/firefox\/([\d\.]+)/))
+            : (s = ua.match(/firefox\/([\d\.]+)/))
-        ? (Sys.firefox = s[1])
+              ? (Sys.firefox = s[1])
-        : (s = ua.match(/(?:opera|opr).([\d\.]+)/))
+              : (s = ua.match(/(?:opera|opr).([\d\.]+)/))
-        ? (Sys.opera = s[1])
+                ? (Sys.opera = s[1])
-        : (s = ua.match(/chrome\/([\d\.]+)/))
+                : (s = ua.match(/chrome\/([\d\.]+)/))
-        ? (Sys.chrome = s[1])
+                  ? (Sys.chrome = s[1])
-        : (s = ua.match(/version\/([\d\.]+).*safari/))
+                  : (s = ua.match(/version\/([\d\.]+).*safari/))
-        ? (Sys.safari = s[1])
+                    ? (Sys.safari = s[1])
-        : 0;
+                    : 0;
      // 根据关系进行判断
      if (Sys.ie) return "IE: " + Sys.ie;
      if (Sys.edge) return "Edge: " + Sys.edge;
@ -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
@ -300,7 +300,7 @@
          </el-select>
        </el-form-item>
        <!-- 高亮标记值 -->
-        <el-form-item v-if="form.Type === 'select' || form.Type === 'radio'"
+        <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">
--- 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
+      <OrgansTbl :criterion-id="criterionId" :is-complete-config="isCompleteConfig" />
        :criterion-id="criterionId"
        :is-complete-config="isCompleteConfig"
      />
    </el-tab-pane>
    <!-- 疗效评估 -->
    <el-tab-pane :label="$t('dictionary:template:basicData:efficacyAssessment')" name="efficacyAssessment">
-      <EfficacyAssessment
+      <EfficacyAssessment v-if="tabs.includes('efficacyAssessment')" :criterion-id="criterionId"
-        v-if="tabs.includes('efficacyAssessment')"
+        :criterion-type="criterionType" :is-complete-config="isCompleteConfig" />
        :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
+      <CriterionDictionary v-if="tabs.includes('criterionDictionary')" :criterion-id="criterionId"
-        v-if="tabs.includes('criterionDictionary')"
+        :is-complete-config="isCompleteConfig" />
-        :criterion-id="criterionId"
+    </el-tab-pane>
-        :is-complete-config="isCompleteConfig"
+    <!-- 关键文件 -->
-      />
+    <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
@ -1,6 +1,6 @@
 <template>
  <div style="position: relative">
-    <el-form  size="small" :inline="true" style="position: relative;">
+    <el-form size="small" :inline="true" style="position: relative;">
      <!-- 阅片规则 -->
      <el-divider content-position="left">{{ $t('dictionary:template:globalConfig:readingRules') }}</el-divider>
      <!-- 是否必须全局阅片 -->
@ -8,68 +8,38 @@
        {{ $fd('YesOrNo', IsMustGlobalReading) }}
      </el-form-item>
      <!-- 配置 -->
-      <el-button
+      <el-button size="mini" type="primary" style="position: absolute;right: 10px;top: 15px"
-        size="mini"
+        v-if="Object.keys(data).length > 0 && !(data.IsCompleteConfig || data.IsBeUsed)" @click="handleAdd(1)">
        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>
-    <el-form  size="small" :inline="true"  style="position: relative">
+    <el-form size="small" :inline="true" style="position: relative">
      <!-- 名称 -->
      <el-divider content-position="left">{{ $t('dictionary:template:globalConfig:name') }}</el-divider>
      <!-- 配置 -->
-      <el-button
+      <el-button size="mini" type="primary" style="position: absolute;right: 10px;top: 15px"
-        size="mini"
+        v-if="Object.keys(data).length > 0 && !(data.IsCompleteConfig || data.IsBeUsed)" @click="handleAdd(2)">
        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
+      <el-table v-loading="loading" style="width: 100%" :data="list" stripe>
        v-loading="loading"
        style="width: 100%"
        :data="list"
        stripe
      >
        <!-- 序号 -->
-        <el-table-column
+        <el-table-column prop="" :label="$t('dictionary:template:globalConfig:order')" width="80">
          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
+        <el-table-column prop="ValueCN" :label="$t('dictionary:template:globalConfig:valueCN')" show-overflow-tooltip>
          prop="ValueCN"
          :label="$t('dictionary:template:globalConfig:valueCN')"
          show-overflow-tooltip
        >
        </el-table-column>
        <!-- 英文值 -->
-        <el-table-column
+        <el-table-column prop="Value" :label="$t('dictionary:template:globalConfig:value')" show-overflow-tooltip>
          prop="Value"
          :label="$t('dictionary:template:globalConfig:value')"
          show-overflow-tooltip
        >
        </el-table-column>
        <!-- 是否基线评估 -->
-        <el-table-column
+        <el-table-column prop="IsBaseLineUse" :label="$t('dictionary:template:globalConfig:isBaseLineUse')"
-          prop="IsBaseLineUse"
+          show-overflow-tooltip>
          :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
+        <el-table-column prop="IsFollowVisitUse" :label="$t('dictionary:template:globalConfig:isFollowVisitUse')"
-          prop="IsFollowVisitUse"
+          show-overflow-tooltip>
          :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
+    <base-model :config="config">
      :config="config"
    >
      <template slot="dialog-body">
-        <el-form  size="small" :inline="true"  label-width="130px">
+        <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>
-          <!-- 评估更新类型 -->
+          <!-- 评估更新类型 @selection-change="handleSelectionChange"-->
-          <el-form-item v-if="config.configType === 2" :label="$t('dictionary:template:globalConfig:updateType')" style="width: 100%">
+          <el-form-item v-if="config.configType === 2" :label="$t('dictionary:template:globalConfig:updateType')"
            style="width: 100%">
          </el-form-item>
-          <el-table
+          <el-table v-if="config.configType === 2" v-loading="loading" ref="multipleTable" :data="GlobalAssessType"
-            v-if="config.configType === 2"
+            stripe>
-            v-loading="loading"
+            <!-- <el-table-column type="selection" width="55">
-            ref="multipleTable"
+            </el-table-column> -->
            :data="GlobalAssessType"
            stripe
            @selection-change="handleSelectionChange"
          >
            <el-table-column
              type="selection"
              width="55">
            </el-table-column>
            <!-- 中文值 -->
-            <el-table-column
+            <el-table-column prop="ValueCN" :label="$t('dictionary:template:globalConfig:valueCN')"
-              prop="ValueCN"
+              show-overflow-tooltip>
              :label="$t('dictionary:template:globalConfig:valueCN')"
              show-overflow-tooltip
            >
            </el-table-column>
            <!-- 英文值 -->
-            <el-table-column
+            <el-table-column prop="Value" :label="$t('dictionary:template:globalConfig:value')" show-overflow-tooltip>
              prop="Value"
              :label="$t('dictionary:template:globalConfig:value')"
              show-overflow-tooltip
            >
            </el-table-column>
            <!-- 是否基线评估 -->
-            <el-table-column
+            <el-table-column prop="IsBaseLineUse" :label="$t('dictionary:template:globalConfig:isBaseLineUse')"
-              prop="IsBaseLineUse"
+              show-overflow-tooltip>
              :label="$t('dictionary:template:globalConfig:isBaseLineUse')"
              show-overflow-tooltip
            >
              <template slot-scope="scope">
-                <el-switch
+                <el-switch v-model="scope.row.IsBaseLineUse" @change="() => $forceUpdate()">
                  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
+            <el-table-column prop="IsFollowVisitUse" :label="$t('dictionary:template:globalConfig:isFollowVisitUse')"
-              prop="IsFollowVisitUse"
+              show-overflow-tooltip>
              :label="$t('dictionary:template:globalConfig:isFollowVisitUse')"
              show-overflow-tooltip
            >
              <template slot-scope="scope">
-                <el-switch
+                <el-switch v-model="scope.row.IsFollowVisitUse" @change="() => $forceUpdate()">
                  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,
+            DictionaryId: v.DictionaryId,
-            IsBaseLineUse: v.IsBaseLineUse,
+            IsBaseLineUse: v.IsBaseLineUse ? v.IsBaseLineUse : false,
-            IsFollowVisitUse: v.IsFollowVisitUse,
+            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
@ -228,7 +228,7 @@
          </el-select>
        </el-form-item>
        <!-- 高亮标记值 -->
-        <el-form-item v-if="form.Type === 'select' || form.Type === 'radio'"
+        <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">
--- a/src/views/dictionary/template/email/components/EmailList.vue
+++ b/src/views/dictionary/template/email/components/EmailList.vue
@ -41,6 +41,7 @@
            <el-option v-for="item of UserTypeList" :value="item.value" :label="item.label" :key="item.id" />
          </el-select>
        </el-form-item>
        <!--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" />
--- 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
+      <el-tab-pane :label="$t('dictionary:template:tab:criterionsConfig')" name="criterions">
        :label="$t('dictionary:template:tab:criterionsConfig')"
        name="criterions"
      >
        <criterions-tmp v-if="activeTab == 'criterions'" />
      </el-tab-pane>
      <!-- 临床数据配置 -->
-      <el-tab-pane
+      <el-tab-pane :label="$t('dictionary:template:tab:clinicalDataConfig')" name="clinicalData">
        :label="$t('dictionary:template:tab:clinicalDataConfig')"
        name="clinicalData"
      >
        <clinical-data v-if="activeTab == 'clinicalData'" />
      </el-tab-pane>
      <!-- 医学审核问题配置 -->
-      <el-tab-pane
+      <el-tab-pane :label="$t('dictionary:template:tab:medicalConfig')" name="medicalAudit">
        :label="$t('dictionary:template:tab:medicalConfig')"
        name="medicalAudit"
      >
        <medical-audit v-if="activeTab == 'medicalAudit'" />
      </el-tab-pane>
      <!-- DICOM字段匿名化配置 -->
-      <el-tab-pane
+      <el-tab-pane :label="$t('dictionary:template:tab:dicomTagConfig')" name="anonymization">
        :label="$t('dictionary:template:tab:dicomTagConfig')"
        name="anonymization"
      >
        <Anonymization v-if="activeTab == 'anonymization'" />
      </el-tab-pane>
      <!-- DICOM字段新增配置 -->
-      <el-tab-pane
+      <el-tab-pane :label="$t('dictionary:template:tab:dicomTagAddConfig')" name="increasefields">
        :label="$t('dictionary:template:tab:dicomTagAddConfig')"
        name="increasefields"
      >
        <IncreaseFields v-if="activeTab == 'increasefields'" />
      </el-tab-pane>
      <!-- 邮件管理 -->
-      <el-tab-pane
+      <el-tab-pane :label="$t('dictionary:template:tab:emailConfig')" name="email">
        :label="$t('dictionary:template:tab:emailConfig')"
        name="email"
      >
        <Email v-if="activeTab == 'email'" />
      </el-tab-pane>
      <!-- 签名管理 -->
-      <el-tab-pane
+      <el-tab-pane :label="$t('dictionary:template:tab:signConfig')" name="sign">
        :label="$t('dictionary:template:tab:signConfig')"
        name="sign"
      >
        <Sign v-if="activeTab == 'sign'" />
      </el-tab-pane>
      <!-- 浏览器推荐 -->
-      <el-tab-pane
+      <el-tab-pane :label="$t('dictionary:template:tab:browserConfig')" name="browser">
        :label="$t('dictionary:template:tab:browserConfig')"
        name="browser"
      >
        <Browser v-if="activeTab == 'browser'" />
      </el-tab-pane>
      <!-- 文件记录 -->
-      <el-tab-pane
+      <el-tab-pane :label="$t('dictionary:template:tab:fileConfig')" name="file">
        :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/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">
-              <el-input v-model="form.VerificationCode" autocomplete="off" />
+              <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-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>
        </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
@ -77,13 +77,22 @@
            </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="
              VUE_APP_OSS_CONFIG_REGION !== 'oss-us-west-1' &&
@ -181,6 +190,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 },
@ -228,6 +240,8 @@ export default {
      Img1,
      toggleRoleVisible: false,
      toggleRoleLoading: false,
      Agreement: [],
      checked: true
    }
  },
  computed: {
@ -256,7 +270,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')
@ -278,9 +291,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
    },
@ -676,7 +710,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/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
+      <el-select v-model="form.TrialSiteId" filterable style="width:100%;"
-        v-model="form.TrialSiteId"
+        :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory" @change="handleSiteChange">
-        filterable
+        <el-option v-for="(item, index) of siteOptions" :key="index" :label="item.TrialSiteAliasName"
-        style="width:100%;"
+          :value="item.TrialSiteId" />
        :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
+    <el-form-item :label="$t('trials:researchForm:form:contactorPhone')" prop="Phone">
      :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-form-item v-if="!notShowFieldList.includes('AverageEngravingCycle')"
-      <el-input-number v-model="form.AverageEngravingCycle" :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory" controls-position="right" :min="0" />
+      :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-form-item v-if="!notShowFieldList.includes('IsConfirmImagingTechnologist')"
-      <el-radio-group v-model="form.IsConfirmImagingTechnologist" :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory">
+      :label="$t('trials:researchForm:form:isQualified')">
-        <el-radio
+      <el-radio-group v-model="form.IsConfirmImagingTechnologist"
-          v-for="item of $d.YesOrNo"
+        :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory">
-          :key="`IsConfirmImagingTechnologist${item.value}`"
+        <el-radio v-for="item of $d.YesOrNo" :key="`IsConfirmImagingTechnologist${item.value}`" :label="item.value">{{
-          :label="item.value"
+          item.label }}</el-radio>
        >{{ item.label }}</el-radio>
      </el-radio-group>
    </el-form-item>
    <!-- 原因 -->
-    <el-form-item
+    <el-form-item v-if="!notShowFieldList.includes('NotConfirmReson') && form.IsConfirmImagingTechnologist === false"
-      v-if="!notShowFieldList.includes('NotConfirmReson') && form.IsConfirmImagingTechnologist === false"
+      :label="$t('trials:researchForm:form:notQualifiedReason')">
-      :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-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-form-item v-if="!notShowFieldList.includes('EfficacyEvaluatorType')"
-      <el-radio-group v-model="form.EfficacyEvaluatorType" :disabled="!(state === 0 && userTypeEnumInt === 0)|| isHistory">
+      :label="$t('trials:researchForm:form:staffType')">
-        <el-radio v-for="item of $d.EfficacyEvaluatorType" :key="`EfficacyEvaluatorType${item.value}`" :label="item.value">{{ item.label }}</el-radio>
+      <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-group v-model="form.IsFollowStudyParameters"
-        <el-radio v-for="item of $d.YesOrNo" :key="`IsFollowStudyParameters${item.value}`" :label="item.value">{{ item.label }}</el-radio>
+        :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
+    <el-form-item v-if="!notShowFieldList.includes('NotFollowReson') && !form.IsFollowStudyParameters">
      v-if="!notShowFieldList.includes('NotFollowReson') && !form.IsFollowStudyParameters"
    >
      <span slot="label" v-html="$t('trials:researchForm:form:notFollowStudyParam')" />
-      <el-input
+      <el-input v-model="form.NotFollowReson" type="textarea" :autosize="{ minRows: 2, maxRows: 4 }"
-        v-model="form.NotFollowReson"
+        :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory" />
        type="textarea"
        :autosize="{ minRows: 2, maxRows: 4}"
        :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory"
      />
    </el-form-item>
    <el-form-item>
      <!-- 保存 -->
-      <el-button
+      <el-button v-if="state === 0 && userTypeEnumInt === 0 && !isHistory" type="primary" :loading="btnLoading"
-        v-if="state === 0 && userTypeEnumInt === 0 && !isHistory"
+        size="small" @click="handleSave(false)">
        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
+    <el-dialog v-if="rejectVisible" :visible.sync="rejectVisible" :close-on-click-modal="false"
-      v-if="rejectVisible"
+      :title="$t('trials:researchForm:dialogTitle:reject')" width="600px" custom-class="base-dialog-wrapper"
-      :visible.sync="rejectVisible"
+      :append-to-body="userTypeEnumInt !== 0">
      :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
+          <el-form-item :label="$t('trials:researchForm:form:rejectReson')" prop="reason" :rules="[
-            :label="$t('trials:researchForm:form:rejectReson')"
+            { required: true, message: $t('trials:researchForm:formRule:specify') }
-            prop="reason"
+          ]">
-            :rules="[
+            <el-input v-model="rejectForm.reason" type="textarea" :autosize="{ minRows: 2, maxRows: 4 }"
-              { required: true, message: $t('trials:researchForm:formRule:specify')}
+              style="width:100%;" />
            ]"
          >
            <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{
+  ::v-deep .full-dialog-container {
-   .el-dialog__body{
+    .el-dialog__body {
      height: calc(100% - 80px);
    }
  }
-  ::v-deep .dialog-container{
+
  ::v-deep .dialog-container {
    // margin-top: 50px !important;
-    width:75%;
+    width: 75%;
-    height:80%;
+    height: 80%;
-    .el-dialog__body{
+
    .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 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>{{ $t('trials:researchForm:title:researchSurveyStatus') }} <el-tag>{{ $fd('ResearchRecord', state)
        }}</el-tag></div>
        <div>
          <!-- 提交 -->
-          <el-button
+          <el-button v-if="(state === 0 && userTypeEnumInt === 0)" type="primary" size="small"
-            v-if="(state === 0 && userTypeEnumInt === 0)"
+            @click="handleSubmit('submit')">
            type="primary"
            size="small"
            @click="handleSubmit('submit')"
          >
            {{ $t('trials:researchForm:button:submit') }}
          </el-button>
          <!-- 审核通过 -->
-          <el-button
+          <el-button v-if="(state === 1 && hasPermi(['role:spm', 'role:cpm']))" type="primary" size="small"
-            v-if="(state === 1 && hasPermi(['role:spm','role:cpm']))"
+            @click="handleSubmit('approve')">
            type="primary"
            size="small"
            @click="handleSubmit('approve')"
          >
            {{ $t('trials:researchForm:button:auditPasses') }}
          </el-button>
          <!-- 审核通过 -->
-          <el-button
+          <el-button v-if="(state === 2 && hasPermi(['role:pm', 'role:apm']))" type="primary" size="small"
-            v-if="(state === 2 && hasPermi(['role:pm','role:apm']))"
+            @click="generateAccount">
            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'])))"
+            v-if="((state === 1 && hasPermi(['role:spm', 'role:cpm'])) || (state === 2 && hasPermi(['role:pm', 'role:apm'])))"
-            type="primary"
+            type="primary" size="small" @click="handleReject">
            size="small"
            @click="handleReject"
          >
            {{ $t('trials:researchForm:button:auditRejected') }}
          </el-button>
          <!-- 历史记录 -->
-          <el-button
+          <el-button v-if="userTypeEnumInt === 0" type="primary" size="small" @click="handleHistory">
            v-if="userTypeEnumInt === 0"
            type="primary"
            size="small"
            @click="handleHistory"
          >
            {{ $t('trials:researchForm:button:historicalRecord') }}
          </el-button>
          <!-- 退出 -->
-          <el-button
+          <el-button v-if="userTypeEnumInt === 0" type="primary" size="small" @click="handleBack">
            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
+    <el-dialog v-if="rejectVisible" :visible.sync="rejectVisible" :close-on-click-modal="false"
-      v-if="rejectVisible"
+      :title="$t('trials:researchForm:dialogTitle:reject')" width="600px" custom-class="base-dialog-wrapper"
-      :visible.sync="rejectVisible"
+      append-to-body>
      :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
+          <el-form-item :label="$t('trials:researchForm:form:rejectReson')" prop="reason" :rules="[
-            :label="$t('trials:researchForm:form:rejectReson')"
+            { required: true, message: $t('trials:researchForm:formRule:specify') }
-            prop="reason"
+          ]">
-            :rules="[
+            <el-input v-model="rejectForm.reason" type="textarea" :autosize="{ minRows: 2, maxRows: 4 }"
-              { required: true, message: $t('trials:researchForm:formRule:specify')}
+              style="width:100%;" />
            ]"
          >
            <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
+    <el-dialog :visible.sync="historyVisible"
-      :visible.sync="historyVisible"
+      :custom-class="isFullscreen ? 'full-dialog-container' : 'dialog-container'" :close-on-click-modal="false"
-      :custom-class="isFullscreen?'full-dialog-container':'dialog-container'"
+      :fullscreen="isFullscreen" :show-close="false">
      :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="isFullscreen ? 'exit-fullscreen' : 'fullscreen'"
-            <svg-icon icon-class="dClose" style="cursor: pointer;font-size: 25px;margin-left: 10px;" @click="historyVisible = false" />
+              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
+        <HistoricalRecord :trial-id="trialId" :site-id="siteId" :trial-site-survey-id="trialSiteSurveyId" />
          :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{
+  ::v-deep.full-dialog-container {
-   .el-dialog__body{
+    .el-dialog__body {
      height: calc(100% - 80px);
    }
  }
-  ::v-deep.dialog-container{
+
  ::v-deep.dialog-container {
    // margin-top: 50px !important;
-    width:75%;
+    width: 75%;
-    height:80%;
+    height: 80%;
-    .el-dialog__body{
+
    .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
+        <el-form ref="resetForm" v-loading="loading" :model="form" label-width="150px" style="width:80%;margin:0 auto;"
-          ref="resetForm"
+          :rules="rules" class="demo-ruleForm" size="small">
          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-select v-model="form.TrialSiteId" filterable style="width:100%;" @change="handleSiteChange"
-              <el-option
+              :disabled="isUpload">
-                v-for="(item,index) of siteOptions"
+              <el-option v-for="(item, index) of siteOptions" :key="index" :label="item.TrialSiteAliasName"
-                :key="index"
+                :value="item.TrialSiteId" />
                :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>
-            <!-- 取消更新调研表 -->
+            <!-- 取消更新调研表  form.ReplaceUserEmailOrPhone = '' -->
-            <el-link v-else type="primary" @click="form.IsUpdate = false;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-form-item v-if="form.IsUpdate" :label="$t('trials:researchForm:form:originalEmail')"
-            <el-input v-model="form.ReplaceUserEmailOrPhone" autocomplete="new-password" />
+            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
+              <el-button size="small" class="codeBtn" style="width:100%;"
-                size="small"
+                :disabled="sendDisabled || !form.EmailOrPhone || count > 0" @click="handleSendCode">{{
-                type="primary"
+                  this.$t('trials:researchForm:button:send') }} {{ sendTitle ? `${sendTitle}` : null }}</el-button>
                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
+        <el-form ref="resetForm" v-loading="loading" :model="form" label-width="150px"
-          ref="resetForm"
+          style="width: 80%; margin: 0 auto" :rules="rules" class="demo-ruleForm" size="small">
          v-loading="loading"
          :model="form"
          label-width="150px"
          style="width: 80%; margin: 0 auto"
          :rules="rules"
          class="demo-ruleForm"
          size="small"
        >
          <!-- 联系邮箱 -->
-          <el-form-item
+          <el-form-item :label="$t('trials:researchForm:form:contactorEmail')" prop="EmailOrPhone">
-            :label="$t('trials:researchForm:form:contactorEmail')"
+            <el-input v-model="form.EmailOrPhone" autocomplete="new-password" @change="handleEmailChange" />
            prop="EmailOrPhone"
          >
            <el-input
              v-model="form.EmailOrPhone"
              autocomplete="new-password"
              @change="handleEmailChange"
            />
          </el-form-item>
          <!-- 验证码 -->
-          <el-form-item
+          <el-form-item :label="$t('trials:researchForm:form:verifyCode')" prop="VerificationCode">
-            :label="$t('trials:researchForm:form:verifyCode')"
+            <div style="display: flex;;justify-content: space-between;">
-            required
+              <el-input v-model="form.VerificationCode" autocomplete="new-password" />
-          >
+              <el-button size="small" style="margin-left: 10px;" :disabled="sendDisabled" class="codeBtn"
-            <el-col :span="20">
+                @click="handleSendCode">{{ this.$t('trials:researchForm:button:send')
-              <el-form-item prop="VerificationCode">
+                }}{{ count || count === 0 ? `(${count}s)` : '' }}</el-button>
-                <el-input
+            </div>
                  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>
          <el-form-item>
            <!-- 取消 -->
@ -59,12 +28,7 @@
              {{ $t('common:button:cancel') }}
            </el-button>
            <!-- 提交 -->
-            <el-button
+            <el-button size="small" type="primary" :loading="btnLoading" @click="onSubmit">
              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,21 +213,16 @@ 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=${
+                  path: `/curriculumVitae?Id=${res.Result.DoctorId ? res.Result.DoctorId : ''
-                    res.Result.DoctorId ? res.Result.DoctorId : ''
+                    }&tabActive=BasicInfo&ReviewStatus=${res.Result.ReviewStatus
-                  }&tabActive=BasicInfo&ReviewStatus=${
+                    }&trialId=${this.$route.query.trialId}&lang=${this.$route.query.lang
-                    res.Result.ReviewStatus
+                    }`,
                  }&trialId=${this.$route.query.trialId}&lang=${
                    this.$route.query.lang
                  }`,
                })
              } else {
                this.$router.push({
-                  path: `/curriculumVitae?Id=${
+                  path: `/curriculumVitae?Id=${res.Result.DoctorId ? res.Result.DoctorId : ''
-                    res.Result.DoctorId ? res.Result.DoctorId : ''
+                    }&tabActive=BasicInfo&ReviewStatus=${res.Result.ReviewStatus
-                  }&tabActive=BasicInfo&ReviewStatus=${
+                    }&lang=${this.$route.query.lang}`,
                    res.Result.ReviewStatus
                  }&lang=${this.$route.query.lang}`,
                })
              }
            })
@ -312,9 +271,8 @@ export default {
        this.timer = setInterval(() => {
          if (this.count > 0 && this.count <= TIME_COUNT) {
            this.count--
-            this.sendTitle = `${this.$t('trials:researchForm:button:send')}(${
+            this.sendTitle = `${this.$t('trials:researchForm:button:send')}(${this.count
-              this.count
+              }s)`
            }s)`
            this.sendDisabled = true
          } else {
            this.sendDisabled = false
@ -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="
+          v-if="scope.row.ExperienceDataType != 3"
            scope.row.ExperienceDataType != 2 &&
            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
+      <el-menu :default-active="activeIndex" class="el-menu-demo" mode="vertical" @select="handleSelect"
-        :default-active="activeIndex"
+        background-color="#eee" active-text-color="#000">
        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
+          <info :DATA="{
-            :DATA="{
+            ...reviewerData.BasicInfoView,
-              ...reviewerData.BasicInfoView,
+            ...reviewerData.EmploymentView,
-              ...reviewerData.EmploymentView,
+          }" :reviewerId.sync="reviewerId" :isEN="isEN" @getInfo="getDetail" />
            }"
            :reviewerId.sync="reviewerId"
            :isEN="isEN"
            @getInfo="getDetail"
          />
        </div>
        <!--概述-->
        <div class="box" id="summarize">
-          <summarize
+          <summarize :DATA="{
-            :DATA="{
+            ...reviewerData.SummarizeInfo,
-              ...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
+          <specialty :DATA="{
-            :DATA="{
+            ...reviewerData.SpecialtyView,
-              ...reviewerData.SpecialtyView,
+          }" :isEN="isEN" :reviewerId.sync="reviewerId" @getInfo="getDetail" />
            }"
            :isEN="isEN"
            :reviewerId.sync="reviewerId"
            @getInfo="getDetail"
          />
        </div>
        <!--教育经历-->
        <div class="box" id="educationalExperience">
-          <educationalExperience
+          <educationalExperience :DATA="reviewerData.EducationList" :isEN="isEN" :reviewerId.sync="reviewerId"
-            :DATA="reviewerData.EducationList"
+            @getInfo="getDetail" />
            :isEN="isEN"
            :reviewerId.sync="reviewerId"
            @getInfo="getDetail"
          />
        </div>
        <!--进修培训-->
        <div class="box" id="continuingTraining">
-          <continuingTraining
+          <continuingTraining :DATA="reviewerData.PostgraduateList" :isEN="isEN" :reviewerId.sync="reviewerId"
-            :DATA="reviewerData.PostgraduateList"
+            @getInfo="getDetail" />
            :isEN="isEN"
            :reviewerId.sync="reviewerId"
            @getInfo="getDetail"
          />
        </div>
        <!--科研课题-->
        <div class="box" id="scientificResearchProject">
-          <scientificResearchProject
+          <scientificResearchProject :DATA="{ ...reviewerData.ResearchPublicationView }" :isEN="isEN"
-            :DATA="{ ...reviewerData.ResearchPublicationView }"
+            :reviewerId.sync="reviewerId" @getInfo="getDetail" />
            :isEN="isEN"
            :reviewerId.sync="reviewerId"
            @getInfo="getDetail"
          />
        </div>
        <!--临床试验-->
        <div class="box" id="clinicalTrials">
-          <clinicalTrials
+          <clinicalTrials :DATA="{ ...reviewerData.TrialExperienceView }" :isEN="isEN" :reviewerId.sync="reviewerId"
-            :DATA="{ ...reviewerData.TrialExperienceView }"
+            :trialId="trialId" @getInfo="getDetail" />
            :isEN="isEN"
            :reviewerId.sync="reviewerId"
            :trialId="trialId"
            @getInfo="getDetail"
          />
        </div>
        <!--gcp证书-->
        <div class="box" id="treatise">
-          <treatise
+          <treatise :DATA="{ ...reviewerData.ResearchPublicationView }" :isEN="isEN" :reviewerId.sync="reviewerId"
-            :DATA="{ ...reviewerData.ResearchPublicationView }"
+            @getInfo="getDetail" />
            :isEN="isEN"
            :reviewerId.sync="reviewerId"
            @getInfo="getDetail"
          />
        </div>
        <!--其他相关经历-->
        <div class="box" id="other">
-          <other
+          <other :DATA="{ ...reviewerData.ResearchPublicationView }" :isEN="isEN" :reviewerId.sync="reviewerId"
-            :DATA="{ ...reviewerData.ResearchPublicationView }"
+            @getInfo="getDetail" />
            :isEN="isEN"
            :reviewerId.sync="reviewerId"
            @getInfo="getDetail"
          />
        </div>
        <div class="box" id="pay">
-          <pay
+          <pay :DATA="{ ...reviewerData.PaymentModeInfo }" :isEN="isEN" :reviewerId.sync="reviewerId"
-            :DATA="{ ...reviewerData.PaymentModeInfo }"
+            @getInfo="getDetail" />
            :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
+        <certificate :DATA="reviewerData.AttachmentList" :isEN="isEN" :reviewerId.sync="reviewerId"
-          :DATA="reviewerData.AttachmentList"
+          @getInfo="getDetail" />
          :isEN="isEN"
          :reviewerId.sync="reviewerId"
          @getInfo="getDetail"
        />
        <!--协议-->
-        <agreement
+        <agreement :DATA="reviewerData.AttachmentList" :isEN="isEN" :isPM="isPM" :reviewerId.sync="reviewerId"
-          :DATA="reviewerData.AttachmentList"
+          @getInfo="getDetail" />
          :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
+        <preview :isEN="isEN" :reviewerId.sync="reviewerId" :trialId="trialId" :isAll="isAll" v-if="visible" />
          :isEN="isEN"
          :reviewerId.sync="reviewerId"
          :trialId="trialId"
          :isAll="isAll"
          v-if="visible"
        />
      </div>
    </el-dialog>
-    <holiday
+    <holiday v-if="holidayVisible" :reviewerId.sync="reviewerId" :visible.sync="holidayVisible" />
      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>标签为止 */
+      white-space: nowrap;
-      text-overflow: ellipsis; /* 当文本溢出包含它的容器时，显示省略号(...)来表示被截断的文本 */
+      /* 文本不会换行，会在同一行内继续，直到遇到<br>标签为止 */
-      overflow: hidden; /* 隐藏溢出容器的文本 */
+      text-overflow: ellipsis;
      /* 当文本溢出包含它的容器时，显示省略号(...)来表示被截断的文本 */
      overflow: hidden;
      /* 隐藏溢出容器的文本 */
    }
    i {
      cursor: pointer;
      margin: 3px;
      color: #409eff;
    }
    .disable {
      cursor: not-allowed;
      color: #909399;
--- a/src/views/system/email/components/detail.vue
+++ b/src/views/system/email/components/detail.vue
@ -0,0 +1,228 @@
 <template>
    <div class="detail">
        <div class="attachment" v-if="Array.isArray(info.AttachmentList) && info.AttachmentList.length > 0">
            <div class="box" v-for="item of info.AttachmentList" :key="item.AttachmentPath" @click="perview(item)">
                <i :class="`icon icon_file icon_${item.type}`" />
                <span>{{ item.AttachmentName }}</span>
            </div>
            <span class="downLoadTip" @click="downloadFile">{{ $t('system:email:tip:allDownLoad') }}</span>
        </div>
        <div class="content" v-html="info.Content"></div>
        <viewer ref="picture_perview" style="margin: 0 10px"
            v-if="rowData.type && ['png', 'jpg', 'jpeg'].includes(rowData.type.toLowerCase())"
            :images="[`${OSSclientConfig.basePath}${rowData.AttachmentPath}`]" :options="viewerOptions">
            <img v-show="false" :src="`${OSSclientConfig.basePath}${rowData.AttachmentPath}`" alt="Image" />
        </viewer>
    </div>
 </template>
 <script>
 import { downLoadFile } from '@/utils/stream.js'
 export default {
    name: "emailDetail",
    props: {
        info: {
            type: Object,
            default: () => {
                return {}
            }
        }
    },
    data() {
        return {
            rowData: {},
            viewerOptions: {
                toolbar: {
                    zoomIn: true,
                    zoomOut: true,
                    reset: true,
                    prev: false,
                    next: false,
                    rotateLeft: true,
                    rotateRight: true,
                    flipHorizontal: true,
                    flipVertical: true,
                }
            }
        }
    },
    methods: {
        //预览
        perview(data) {
            this.rowData = data
            if (['.ppt',
                '.pptx',
                '.doc',
                '.docx',
                '.xls',
                '.xlsx'].includes(`.${data.type.toLowerCase()}`)) {
                this.$onlyOffice({
                    path: data.AttachmentPath,
                    type: data.type,
                    title: data.AttachmentName
                })
            }
            if (['.jpg',
                '.jpeg',
                '.png'].includes(`.${data.type.toLowerCase()}`)) {
                this.$refs['picture_perview'].$viewer.show()
            }
            if (['.pdf'].includes(`.${data.type.toLowerCase()}`)) {
                this.$preview({
                    path: data.Path || data.AttachmentPath,
                    type: 'pdf',
                    title: data.AttachmentName,
                })
            }
        },
        async downloadFile() {
            try {
                let { files, name } = this.formatDownloadFile(this.info.AttachmentList)
                let res = await downLoadFile(files, name, 'zip')
            } catch (err) {
                console.log(err)
            }
        },
        // 格式化下载文件路径
        formatDownloadFile(list) {
            let files = [],
                name = `Attachment_${new Date().getTime()}.zip`
            list.forEach(item => {
                let obj = {
                    name: item.AttachmentName,
                    url: this.OSSclientConfig.basePath + item.AttachmentPath,
                }
                files.push(obj)
            })
            return { files, name }
        },
    }
 }
 </script>
 <style lang="scss" scoped>
 .attachment {
    border-bottom: 1px solid #EBEEF5;
    padding: 10px 0 0 0;
    display: flex;
    .box {
        padding: 5px 10px;
        display: flex;
        align-items: center;
        max-width: 400px;
        overflow: hidden;
        white-space: nowrap;
        text-overflow: ellipsis;
        border-radius: 5px;
        background-color: #E4E7ED;
        cursor: pointer;
        margin-right: 10px;
        margin-bottom: 10px;
        i {
            margin-right: 5px;
        }
    }
    .downLoadTip {
        cursor: pointer;
        font-size: 14px;
        color: #409EFF;
    }
 }
 .content {
    width: 100%;
    overflow: hidden;
 }
 .icon {
    height: 20px;
    width: 20px;
    padding: 0px;
    line-height: 20px;
    margin-right: 6px;
    margin-top: 6px;
 }
 /*文件*/
 .icon_file {
    width: 16px !important;
    height: 16px !important;
    margin-right: 6px;
    background-size: inherit;
    background-image: url(@/assets/0.file-16.png);
    background-position: 0 0;
    margin-top: -2px;
    background-repeat: no-repeat;
    font-style: normal;
    display: inline-block;
    pointer-events: none;
    font-size: 85%;
 }
 /*文件夹*/
 .icon_folder {
    background-image: url(@/assets/folder_win11_small.png);
    margin-top: -6px;
    margin-left: 2px;
    margin-right: 6px;
    background-repeat: no-repeat;
 }
 /*docx*/
 .icon_docx {
    background-position: -81px -560px !important;
    margin-top: 0;
    margin-left: 2px;
 }
 /*doc*/
 .icon_doc {
    background-position: -81px -592px !important;
    margin-top: 0;
    margin-left: 2px;
 }
 /*xlsx*/
 .icon_xlsx {
    background-position: -81px -48px !important;
    margin-top: 0;
    margin-left: 2px;
 }
 /*pdf*/
 .icon_pdf {
    background-position: -81px -352px !important;
    margin-top: 0;
    margin-left: 2px;
 }
 /*pptx*/
 .icon_pptx {
    background-position: -81px -288px !important;
    margin-top: 0;
    margin-left: 2px;
 }
 /*zip*/
 .icon_zip {
    background-position: 0 0 !important;
    margin-top: -2px;
    margin-left: 2px;
 }
 /*ppt*/
 .icon_ppt {
    background-position: -81px -304px !important;
    margin-top: 0;
    margin-left: 2px;
 }
 /*xls*/
 .icon_xls {
    background-position: -81px -96px !important;
    margin-top: 0;
    margin-left: 2px;
 }
 </style>
--- a/src/views/system/email/components/resendList.vue
+++ b/src/views/system/email/components/resendList.vue
@ -0,0 +1,264 @@
 <template>
    <div class="event">
        <div ref="leftContainer" class="left">
            <el-form :inline="true">
                <el-form-item :label="$t('system:email:search:ToRecipientName')">
                    <el-input v-model="searchData.ToRecipientName" clearable />
                </el-form-item>
                <el-form-item :label="$t('system:email:search:CcRecipientName')">
                    <el-input v-model="searchData.CcRecipientName" clearable />
                </el-form-item>
                <el-form-item :label="$t('system:email:search:EmailStateEnum')">
                    <el-select v-model="searchData.EmailStateEnum" clearable filterable placeholder="">
                        <el-option v-for="item in $d.EmailState" :key="item.id" :label="item.label"
                            :value="item.value" />
                    </el-select>
                </el-form-item>
                <!-- <el-form-item :label="$t('system:email:search:EmailStateEnum')">
                    <el-select v-model="searchData.EmailStateEnum" clearable filterable placeholder="">
                        <el-option v-for="item in $d.EmailState" :key="item.id" :label="item.label"
                            :value="item.value" />
                    </el-select>
                </el-form-item> -->
                <el-form-item :label="$t('system:email:search:emailDate')">
                    <el-date-picker v-model="datetimerange" type="datetimerange"
                        :default-time="['00:00:00', '23:59:59']" :start-placeholder="$t('feedBack:search:beginTime')"
                        :end-placeholder="$t('feedBack:search:endTime')" value-format="yyyy-MM-dd HH:mm:ss"
                        @change="handleDatetimeChange" />
                </el-form-item>
                <el-form-item>
                    <el-button type="primary" icon="el-icon-search" size="small" @click="getList">
                        {{ $t('common:button:search') }}
                    </el-button>
                    <el-button icon="el-icon-refresh-left" size="small" @click="handleReset">
                        {{ $t('common:button:reset') }}
                    </el-button>
                    <!-- <el-button type="primary" size="small" @click="synchronizationEmail">
                        {{ $t('system:email:button:sync') }}
                    </el-button> -->
                </el-form-item>
            </el-form>
            <el-table v-loading="loading" v-adaptive="{ bottomOffset: 45 }" height="100" :data="list" class="table"
                @sort-change="handleSortByColumn">
                <el-table-column type="index" width="50" />
                <el-table-column :label="$t('system:email:table:messageId')" prop="MessageId" show-overflow-tooltip
                    sortable="custom" />
                <el-table-column :label="$t('system:email:table:emailSubject')" prop="EmailSubject"
                    show-overflow-tooltip />
                <el-table-column :label="$t('system:email:table:ToRecipientName')" prop="ToRecipientName"
                    show-overflow-tooltip>
                    <template slot-scope="scope">
                        <el-tooltip class="item" effect="dark" :content="scope.row.RecipientList.filter(item => item.RecipientTypeEnum === 0).map(item =>
                            `${item.RecipientName}: ${item.RecipientAddress}`).join('<br/>')" placement="top-start"
                            v-if="Array.isArray(scope.row.RecipientList) && scope.row.RecipientList.length > 0">
                            <span>{{Array.isArray(scope.row.RecipientList) && scope.row.RecipientList.length > 0
                                ? scope.row.RecipientList.filter(item => item.RecipientTypeEnum === 0).map(item =>
                                    item.RecipientName).join(", ") : ''
                            }}</span>
                        </el-tooltip>
                    </template>
                </el-table-column>
                <el-table-column :label="$t('system:email:table:CcRecipientName')" prop="CcRecipientName"
                    show-overflow-tooltip>
                    <template slot-scope="scope">
                        <el-tooltip class="item" effect="dark" :content="scope.row.RecipientList.filter(item => item.RecipientTypeEnum === 1).map(item =>
                            `${item.RecipientName}: ${item.RecipientAddress}`).join('<br/>')" placement="top-start"
                            v-if="Array.isArray(scope.row.RecipientList) && scope.row.RecipientList.length > 0">
                            <span>{{Array.isArray(scope.row.RecipientList) && scope.row.RecipientList.length > 0
                                ? scope.row.RecipientList.filter(item => item.RecipientTypeEnum === 1).map(item =>
                                    item.RecipientName).join(", ") : ''
                            }}</span>
                        </el-tooltip>
                    </template>
                </el-table-column>
                <el-table-column :label="$t('system:email:table:emailDate')" prop="EmailDate" show-overflow-tooltip
                    sortable="custom" />
                <el-table-column :label="$t('system:email:table:emailStateEnum')" prop="EmailStateEnum"
                    show-overflow-tooltip sortable="custom">
                    <template slot-scope="scope">
                        <el-tag :type="scope.row.EmailStateEnum === 1 ? 'danger' : ''">{{ $fd("EmailState",
                            scope.row.EmailStateEnum) }}</el-tag>
                    </template>
                </el-table-column>
                <el-table-column :label="$t('system:email:table:errorInfo')" prop="ErrorInfo" show-overflow-tooltip />
                <el-table-column :label="$t('common:action:action')" prop="" show-overflow-tooltip>
                    <template slot-scope="scope">
                        <el-button type="text" @click="view(scope.row)">
                            {{ $t('common:button:view') }}
                        </el-button>
                        <!-- <el-button type="text" @click="resendEmail(scope.row)">
                            {{ $t('system:email:button:resendEmail') }}
                        </el-button> -->
                    </template>
                </el-table-column>
            </el-table>
            <div class="pagination" style="text-align: right; margin-top: 5px">
                <pagination :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
                    @pagination="getList" />
            </div>
        </div>
        <base-model v-if="model_cfg.visible" :config="model_cfg">
            <template slot="dialog-body">
                <emailDetail :info="info" />
            </template>
        </base-model>
    </div>
 </template>
 <script>
 import { getReSendEmail, getEmailInfo } from '@/api/admin'
 import Pagination from '@/components/Pagination'
 import BaseModel from '@/components/BaseModel'
 import emailDetail from "./detail"
 const searchDataDefault = () => {
    return {
        // TrialId: null,
        // EmailStartDate: null,
        // EmailEndDate: null,
        // EmailStateEnum: null,
        // ToRecipientName: null,
        // CcRecipientName: null,
        Id: null,
        Asc: false,
        SortField: 'CreateTime',
        PageIndex: 1,
        PageSize: 20,
    }
 }
 export default {
    name: 'emailLog',
    components: { Pagination, BaseModel, emailDetail },
    props: {
        isSystem: {
            type: Boolean,
            default: true
        },
        rowData: {
            type: Object,
            default: () => {
                return {}
            }
        }
    },
    data() {
        return {
            searchData: searchDataDefault(),
            list: [],
            total: 0,
            loading: false,
            datetimerange: [],
            model_cfg: { visible: false, title: '', width: '500px', fullscreen: true, appendToBody: true },
            info: null,
        }
    },
    watch: {
        "rowData.Id": {
            handler() {
                this.getList()
            }
        }
    },
    mounted() {
        this.getList()
    },
    methods: {
        getList() {
            this.loading = true
            if (!this.rowData.Id) return false
            this.searchData.Id = this.rowData.Id
            if (!this.isSystem) this.searchData.TrialId = this.$route.query.trialId
            getReSendEmail(this.searchData)
                .then((res) => {
                    this.loading = false
                    this.list = res.Result.CurrentPageData
                    this.total = res.Result.TotalCount
                })
                .catch(() => {
                    this.loading = false
                })
        },
        // 查看详情
        async view(row) {
            try {
                let data = {
                    Id: row.Id,
                    TrialId: this.$route.query.trialId
                    // Id: "EC660000-BA37-5C60-8680-08DE1CD6931B"
                }
                let res = await getEmailInfo(data)
                if (res.IsSuccess) {
                    this.info = res.Result
                    if (Array.isArray(this.info.AttachmentList) && this.info.AttachmentList.length > 0) {
                        this.info.AttachmentList.forEach(item => {
                            var type = item.AttachmentName
                                .substring(item.AttachmentName.lastIndexOf('.'))
                                .toLocaleLowerCase().split('.')[1];
                            item.type = type
                        })
                    }
                    this.model_cfg.visible = true
                }
            } catch (err) {
                console.log(err)
            }
        },
        // 重置列表查询
        handleReset() {
            this.searchData = searchDataDefault()
            this.datetimerange = []
            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()
        },
        handleDatetimeChange(val) {
            if (val) {
                this.searchData.EmailStartDate = val[0]
                this.searchData.EmailEndDate = val[1]
            } else {
                this.searchData.EmailStartDate = ''
                this.searchData.EmailEndDate = ''
            }
        },
    },
 }
 </script>
 <style lang="scss" scoped>
 .event {
    height: 100%;
    box-sizing: border-box;
    display: flex;
    padding: 10px;
    border-radius: 5px;
    .left {
        display: flex;
        flex-direction: column;
        width: 0;
        flex-grow: 4;
        // border-right: 1px solid #ccc;
        .filter-container {
            display: flex;
            align-items: center;
            margin: 5px;
        }
        .data-table {
            flex: 1;
            padding: 5px 0px;
        }
        .pagination-container {
            text-align: right;
        }
    }
 }
 </style>
--- a/src/views/system/email/index.vue
+++ b/src/views/system/email/index.vue
@ -0,0 +1,298 @@
 <template>
    <div class="event">
        <div ref="leftContainer" class="left">
            <el-form :inline="true">
                <el-form-item :label="$t('system:email:search:ToRecipientName')">
                    <el-input v-model="searchData.ToRecipientName" clearable />
                </el-form-item>
                <el-form-item :label="$t('system:email:search:CcRecipientName')">
                    <el-input v-model="searchData.CcRecipientName" clearable />
                </el-form-item>
                <el-form-item :label="$t('system:email:search:EmailStateEnum')">
                    <el-select v-model="searchData.EmailStateEnum" clearable filterable placeholder="">
                        <el-option v-for="item in $d.EmailState" :key="item.id" :label="item.label"
                            :value="item.value" />
                    </el-select>
                </el-form-item>
                <!-- <el-form-item :label="$t('system:email:search:EmailStateEnum')">
                    <el-select v-model="searchData.EmailStateEnum" clearable filterable placeholder="">
                        <el-option v-for="item in $d.EmailState" :key="item.id" :label="item.label"
                            :value="item.value" />
                    </el-select>
                </el-form-item> -->
                <el-form-item :label="$t('system:email:search:emailDate')">
                    <el-date-picker v-model="datetimerange" type="datetimerange"
                        :default-time="['00:00:00', '23:59:59']" :start-placeholder="$t('feedBack:search:beginTime')"
                        :end-placeholder="$t('feedBack:search:endTime')" value-format="yyyy-MM-dd HH:mm:ss"
                        @change="handleDatetimeChange" />
                </el-form-item>
                <el-form-item>
                    <el-button type="primary" icon="el-icon-search" size="small" @click="getList">
                        {{ $t('common:button:search') }}
                    </el-button>
                    <el-button icon="el-icon-refresh-left" size="small" @click="handleReset">
                        {{ $t('common:button:reset') }}
                    </el-button>
                    <el-button type="primary" size="small" @click="synchronizationEmail">
                        {{ $t('system:email:button:sync') }}
                    </el-button>
                </el-form-item>
            </el-form>
            <el-table v-loading="loading" v-adaptive="{ bottomOffset: 45 }" height="100" :data="list" class="table"
                @sort-change="handleSortByColumn">
                <el-table-column type="index" width="50" />
                <el-table-column :label="$t('system:email:table:messageId')" prop="MessageId" show-overflow-tooltip
                    sortable="custom" />
                <el-table-column :label="$t('system:email:table:emailSubject')" prop="EmailSubject"
                    show-overflow-tooltip />
                <el-table-column :label="$t('system:email:table:ToRecipientName')" prop="ToRecipientName"
                    show-overflow-tooltip>
                    <template slot-scope="scope">
                        <el-tooltip class="item" effect="dark" :content="scope.row.RecipientList.filter(item => item.RecipientTypeEnum === 0).map(item =>
                            `${item.RecipientName}: ${item.RecipientAddress}`).join('<br/>')" placement="top-start"
                            v-if="Array.isArray(scope.row.RecipientList) && scope.row.RecipientList.length > 0">
                            <span>{{Array.isArray(scope.row.RecipientList) && scope.row.RecipientList.length > 0
                                ? scope.row.RecipientList.filter(item => item.RecipientTypeEnum === 0).map(item =>
                                    item.RecipientName).join(", ") : ''
                            }}</span>
                        </el-tooltip>
                    </template>
                </el-table-column>
                <el-table-column :label="$t('system:email:table:CcRecipientName')" prop="CcRecipientName"
                    show-overflow-tooltip>
                    <template slot-scope="scope">
                        <el-tooltip class="item" effect="dark" :content="scope.row.RecipientList.filter(item => item.RecipientTypeEnum === 1).map(item =>
                            `${item.RecipientName}: ${item.RecipientAddress}`).join('<br/>')" placement="top-start"
                            v-if="Array.isArray(scope.row.RecipientList) && scope.row.RecipientList.length > 0">
                            <span>{{Array.isArray(scope.row.RecipientList) && scope.row.RecipientList.length > 0
                                ? scope.row.RecipientList.filter(item => item.RecipientTypeEnum === 1).map(item =>
                                    item.RecipientName).join(", ") : ''
                            }}</span>
                        </el-tooltip>
                    </template>
                </el-table-column>
                <el-table-column :label="$t('system:email:table:emailDate')" prop="EmailDate" show-overflow-tooltip
                    sortable="custom" />
                <el-table-column :label="$t('system:email:table:emailStateEnum')" prop="EmailStateEnum"
                    show-overflow-tooltip sortable="custom">
                    <template slot-scope="scope">
                        <el-tag :type="scope.row.EmailStateEnum === 1 ? 'danger' : ''">{{ $fd("EmailState",
                            scope.row.EmailStateEnum) }}</el-tag>
                    </template>
                </el-table-column>
                <el-table-column :label="$t('system:email:table:errorInfo')" prop="ErrorInfo" show-overflow-tooltip />
                <el-table-column :label="$t('common:action:action')" fixed="right" prop="" show-overflow-tooltip
                    min-width="120px">
                    <template slot-scope="scope">
                        <el-button type="text" @click="view(scope.row)">
                            {{ $t('common:button:view') }}
                        </el-button>
                        <el-button type="text" @click="resendEmail(scope.row)">
                            {{ $t('system:email:button:resendEmail') }}
                        </el-button>
                        <el-button type="text" @click="openResendEmailList(scope.row)">
                            {{ $t('system:email:button:resendEmailList') }}
                        </el-button>
                    </template>
                </el-table-column>
            </el-table>
            <div class="pagination" style="text-align: right; margin-top: 5px">
                <pagination :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
                    @pagination="getList" />
            </div>
        </div>
        <base-model v-if="model_cfg.visible" :config="model_cfg">
            <template slot="dialog-body">
                <emailDetail :info="info" />
            </template>
        </base-model>
        <el-dialog title="" :visible.sync="resendVisible" width="30%" :fullscreen='true'>
            <resendList :rowData="info" :isSystem="isSystem" />
        </el-dialog>
    </div>
 </template>
 <script>
 import { getEmailLogList, resendEmail, getEmailInfo, synchronizationEmail } from '@/api/admin'
 import Pagination from '@/components/Pagination'
 import BaseModel from '@/components/BaseModel'
 import emailDetail from "./components/detail"
 import resendList from "./components/resendList"
 const searchDataDefault = () => {
    return {
        TrialId: null,
        EmailStartDate: null,
        EmailEndDate: null,
        EmailStateEnum: null,
        ToRecipientName: null,
        CcRecipientName: null,
        Asc: false,
        SortField: 'CreateTime',
        PageIndex: 1,
        PageSize: 20,
    }
 }
 export default {
    name: 'emailLog',
    components: { Pagination, BaseModel, emailDetail, resendList },
    props: {
        isSystem: {
            type: Boolean,
            default: true
        }
    },
    data() {
        return {
            searchData: searchDataDefault(),
            list: [],
            total: 0,
            loading: false,
            datetimerange: [],
            model_cfg: { visible: false, title: '', width: '500px', fullscreen: true },
            info: null,
            resendVisible: false
        }
    },
    mounted() {
        this.getList()
    },
    methods: {
        openResendEmailList(row) {
            this.info = row
            this.resendVisible = true
        },
        getList() {
            this.loading = true
            if (!this.isSystem) this.searchData.TrialId = this.$route.query.trialId
            getEmailLogList(this.searchData)
                .then((res) => {
                    this.loading = false
                    this.list = res.Result.CurrentPageData
                    this.total = res.Result.TotalCount
                })
                .catch(() => {
                    this.loading = false
                })
        },
        // 查看详情
        async view(row) {
            try {
                let data = {
                    Id: row.Id,
                    TrialId: this.$route.query.trialId
                    // Id: "EC660000-BA37-5C60-8680-08DE1CD6931B"
                }
                let res = await getEmailInfo(data)
                if (res.IsSuccess) {
                    this.info = res.Result
                    if (Array.isArray(this.info.AttachmentList) && this.info.AttachmentList.length > 0) {
                        this.info.AttachmentList.forEach(item => {
                            var type = item.AttachmentName
                                .substring(item.AttachmentName.lastIndexOf('.'))
                                .toLocaleLowerCase().split('.')[1];
                            item.type = type
                        })
                    }
                    this.model_cfg.visible = true
                }
            } catch (err) {
                console.log(err)
            }
        },
        // 同步邮件
        async synchronizationEmail() {
            try {
                let data = {
                    TrialId: this.$route.query.trialId
                }
                this.loading = true
                let res = await synchronizationEmail(data)
                this.loading = false
                if (res.IsSuccess) {
                    this.getList()
                    this.$message.success(this.$t("system:email:message:syncSuccessfully"))
                }
            } catch (err) {
                this.loading = false
                console.log(err)
            }
        },
        // 重发邮件
        async resendEmail(row) {
            try {
                let data = {
                    Id: row.Id,
                    TrialId: this.$route.query.trialId
                }
                this.loading = true
                let res = await resendEmail(data)
                this.loading = false
                if (res.IsSuccess) {
                    this.getList()
                    this.$message.success(this.$t("system:email:message:resendSuccessfully"))
                }
            } catch (err) {
                this.loading = false
                console.log(err)
            }
        },
        // 重置列表查询
        handleReset() {
            this.searchData = searchDataDefault()
            this.datetimerange = []
            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()
        },
        handleDatetimeChange(val) {
            if (val) {
                this.searchData.EmailStartDate = val[0]
                this.searchData.EmailEndDate = val[1]
            } else {
                this.searchData.EmailStartDate = ''
                this.searchData.EmailEndDate = ''
            }
        },
    },
 }
 </script>
 <style lang="scss" scoped>
 .event {
    height: 100%;
    box-sizing: border-box;
    display: flex;
    padding: 10px;
    border-radius: 5px;
    .left {
        display: flex;
        flex-direction: column;
        width: 0;
        flex-grow: 4;
        // border-right: 1px solid #ccc;
        .filter-container {
            display: flex;
            align-items: center;
            margin: 5px;
        }
        .data-table {
            flex: 1;
            padding: 5px 0px;
        }
        .pagination-container {
            text-align: right;
        }
    }
 }
 </style>
--- a/src/views/system/login-log/detail.vue
+++ b/src/views/system/login-log/detail.vue
@ -2,26 +2,18 @@
  <base-model v-if="config.visible" :config="config">
    <template slot="dialog-body">
      <el-table :data="curData" border style="width: 100%" size="small">
-        <el-table-column
+        <el-table-column prop="key" :label="$t('system:loginLog:table:cfgItem')" show-overflow-tooltip />
-          prop="key"
+        <el-table-column prop="value" :label="$t('system:loginLog:table:cfgVal')" show-overflow-tooltip>
          :label="$t('system:loginLog:table:cfgItem')"
          show-overflow-tooltip
        />
        <el-table-column
          prop="value"
          :label="$t('system:loginLog:table:cfgVal')"
          show-overflow-tooltip
        >
          <template slot-scope="scope">
-            <span v-if="scope.row.prop !== 'UserRoleList'">{{
+            <el-button v-if="scope.row.prop === 'UserAgreementId'" type="text" size="small"
              @click.stop="view(scope.row)">{{
                $t('dictionary:agreement:button:view')
              }}</el-button>
            <span v-else-if="scope.row.prop !== 'UserRoleList'">{{
              scope.row.value
            }}</span>
            <template v-else>
-              <div
+              <div v-for="item in scope.row.value" :key="item.UserTypeEnum" style="margin: 0">
                v-for="item in scope.row.value"
                :key="item.UserTypeEnum"
                style="margin: 0"
              >
                {{ item.UserTypeShortName
                }}{{ $t('system:loginLog:form:symbol')
                }}{{ $fd('IsEnable', !item.IsUserRoleDisabled) }}
@ -74,7 +66,11 @@ export default {
        'PositionName',
        'DepartmentName',
        'UserRoleList',
        'UserAgreementTypeEnum',
        'FileVersion',
        'UserAgreementId',
      ],
      IsEn_Us: false
    }
  },
  computed: {
@ -87,6 +83,7 @@ export default {
      let obj = JSON.parse(this.JsonObj)
      let curData = []
      Object.keys(obj).forEach((key) => {
        if (key === 'IsEn_Us') this.IsEn_Us = obj[key]
        if (this.curKeys.includes(key)) {
          let o = {
            key: this.$t(`system:loginLog:form:${key}`),
@ -96,12 +93,23 @@ export default {
          if (key === 'Status') {
            o.value = this.$fd('IsUserEnable', obj[key])
          }
          if (key === 'UserAgreementTypeEnum') {
            o.value = this.$fd('UserAgreementType', obj[key])
          }
          curData.push(o)
        }
      })
      return curData
    },
  },
  methods: {
    view(row) {
      this.$AGR({
        Id: row.value,
        IsEn_Us: this.IsEn_Us
      })
    },
  }
 }
 </script>
 <style lang="scss" scoped>
--- a/src/views/trials/trials-layout/components/topLang.vue
+++ b/src/views/trials/trials-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/views/trials/trials-list/components/TrialForm.vue
+++ b/src/views/trials/trials-list/components/TrialForm.vue
@ -1,72 +1,33 @@
 <!-- eslint-disable -->
 <template>
-  <el-form
+  <el-form ref="trialForm" v-loading="loading" label-width="250px" :rules="trialFormRules"
-    ref="trialForm"
+    class="demo-ruleForm trial-Form" :model="trialForm" label-position="right" :inline="true">
    v-loading="loading"
    label-width="250px"
    :rules="trialFormRules"
    class="demo-ruleForm trial-Form"
    :model="trialForm"
    label-position="right"
    :inline="true"
  >
    <el-row>
      <!-- 项目编号 -->
-      <el-form-item
+      <el-form-item v-if="trialForm.Id !== ''" :label="$t('trials:trials-list:form:trialId')" prop="TrialCode">
-        v-if="trialForm.Id !== ''"
+        <el-input v-model="trialForm.TrialCode" @keyup.native="trialCodekeyUp" />
        :label="$t('trials:trials-list:form:trialId')"
        prop="TrialCode"
      >
        <el-input
          v-model="trialForm.TrialCode"
          @keyup.native="trialCodekeyUp"
        />
      </el-form-item>
      <!-- 项目类型 -->
-      <el-form-item
+      <el-form-item :label="$t('trials:trials-list:form:trialType')" prop="TrialType">
-        :label="$t('trials:trials-list:form:trialType')"
+        <el-radio-group v-model="trialForm.TrialType" :disabled="trialForm.Id !== ''">
-        prop="TrialType"
+          <el-radio v-for="item of $d.TrialType" :disabled="isTestUser && (item.value === 1 || item.value === 2)"
-      >
+            :key="item.id" :label="item.value">{{ item.label }}</el-radio>
        <el-radio-group
          v-model="trialForm.TrialType"
          :disabled="trialForm.Id !== ''"
        >
          <el-radio
            v-for="item of $d.TrialType"
            :disabled="isTestUser && (item.value === 1 || item.value === 2)"
            :key="item.id"
            :label="item.value"
            >{{ item.label }}</el-radio
          >
        </el-radio-group>
      </el-form-item>
    </el-row>
    <el-row>
      <!-- 试验名称 -->
-      <el-form-item
+      <el-form-item :label="$t('trials:trials-list:form:experimentName')" prop="ExperimentName">
-        :label="$t('trials:trials-list:form:experimentName')"
+        <el-input v-model="trialForm.ExperimentName" type="textarea" :autosize="{ minRows: 1, maxRows: 4 }" />
        prop="ExperimentName"
      >
        <el-input
          v-model="trialForm.ExperimentName"
          type="textarea"
          :autosize="{ minRows: 1, maxRows: 4 }"
        />
      </el-form-item>
      <!-- 研究方案号 -->
-      <el-form-item
+      <el-form-item :label="$t('trials:trials-list:form:researchNumber')" prop="ResearchProgramNo">
        :label="$t('trials:trials-list:form:researchNumber')"
        prop="ResearchProgramNo"
      >
        <el-input v-model="trialForm.ResearchProgramNo" />
      </el-form-item>
    </el-row>
    <el-row>
      <!-- 主研单位 -->
-      <el-form-item
+      <el-form-item :label="$t('trials:trials-list:form:researchUnit')" prop="MainResearchUnit">
        :label="$t('trials:trials-list:form:researchUnit')"
        prop="MainResearchUnit"
      >
        <el-input v-model="trialForm.MainResearchUnit" />
      </el-form-item>
      <!-- 负责人PI -->
@ -77,63 +38,28 @@
    <el-row>
      <!-- 申办方 -->
      <el-form-item :label="$t('trials:trials-list:form:sponsor')">
-        <el-select
+        <el-select v-model="trialForm.SponsorId" filterable allow-create default-first-option clearable
-          v-model="trialForm.SponsorId"
+          @change="(value) => handleSelectChange(value, 'sponsor')" @visible-change="
          filterable
          allow-create
          default-first-option
          @change="(value) => handleSelectChange(value, 'sponsor')"
          @visible-change="
            (flag) => handleSelectVisibbleChange(flag, 'sponsor')
-          "
+          ">
-        >
+          <el-option v-for="item in sponsorList" :key="item.Id" :label="item.SponsorName" :value="item.Id" />
          <el-option
            v-for="item in sponsorList"
            :key="item.Id"
            :label="item.SponsorName"
            :value="item.Id"
          />
        </el-select>
      </el-form-item>
      <!-- CRO -->
      <el-form-item :label="$t('trials:trials-list:form:cro')">
-        <el-select
+        <el-select v-model="trialForm.CROId" filterable allow-create default-first-option clearable
          v-model="trialForm.CROId"
          filterable
          allow-create
          default-first-option
          @change="(value) => handleSelectChange(value, 'cro')"
-          @visible-change="(flag) => handleSelectVisibbleChange(flag, 'cro')"
+          @visible-change="(flag) => handleSelectVisibbleChange(flag, 'cro')">
-        >
+          <el-option v-for="item of croList" :key="item.Id" :label="item.CROName" :value="item.Id" />
          <el-option
            v-for="item of croList"
            :key="item.Id"
            :label="item.CROName"
            :value="item.Id"
          />
        </el-select>
      </el-form-item>
    </el-row>
    <el-row>
      <!-- DeclarationType -->
-      <el-form-item
+      <el-form-item :label="$t('trials:trials-list:form:declarationType')" prop="DeclarationTypeEnumList">
-        :label="$t('trials:trials-list:form:declarationType')"
+        <el-select v-model="trialForm.DeclarationTypeEnumList" size="small" multiple clearable
-        prop="DeclarationTypeEnumList"
+          @change="handleDeclarationTypeChange" style="width: 100%">
-      >
+          <el-option v-for="item of $d.DeclarationType" :key="item.value" :value="item.value" :label="item.label" />
        <el-select
          v-model="trialForm.DeclarationTypeEnumList"
          size="small"
          multiple
          clearable
          @change="handleDeclarationTypeChange"
          style="width: 100%"
        >
          <el-option
            v-for="item of $d.DeclarationType"
            :key="item.value"
            :value="item.value"
            :label="item.label"
          />
        </el-select>
      </el-form-item>
      <!-- Phase -->
@ -145,79 +71,41 @@
            :label="item.Value"
            :value="item.Id"
          /> -->
-          <el-option
+          <el-option v-for="item of $d.Trial_Phase" :key="item.id" :label="item.label" :value="item.id" />
            v-for="item of $d.Trial_Phase"
            :key="item.id"
            :label="item.label"
            :value="item.id"
          />
        </el-select>
      </el-form-item>
    </el-row>
    <el-row>
      <!-- 适应症类型 IndicationType -->
-      <el-form-item
+      <el-form-item :label="$t('trials:trials-list:form:indicationType')" prop="IndicationTypeId">
-        :label="$t('trials:trials-list:form:indicationType')"
+        <el-select v-model="trialForm.IndicationTypeId" @change="handleIndicationTypeChange">
        prop="IndicationTypeId"
      >
        <el-select
          v-model="trialForm.IndicationTypeId"
          @change="handleIndicationTypeChange"
        >
          <!-- <el-option
            v-for="item of dictionaryList.IndicationType"
            :key="item.Id"
            :label="item.Value"
            :value="item.Id"
          /> -->
-          <el-option
+          <el-option v-for="item of $d.IndicationType" :key="item.id" :label="item.label" :value="item.id" />
            v-for="item of $d.IndicationType"
            :key="item.id"
            :label="item.label"
            :value="item.id"
          />
        </el-select>
      </el-form-item>
      <!-- Indication -->
-      <el-form-item
+      <el-form-item :label="$t('trials:trials-list:form:indication')" prop="IndicationEnum">
        :label="$t('trials:trials-list:form:indication')"
        prop="IndicationEnum"
      >
        <!--        <el-input v-model="trialForm.Indication" />-->
-        <el-select
+        <el-select :disabled="!trialForm.IndicationTypeId" v-if="![37, 38, 39].includes(trialForm.IndicationEnum)"
-          :disabled="!trialForm.IndicationTypeId"
+          v-model="trialForm.IndicationEnum">
-          v-if="![37, 38, 39].includes(trialForm.IndicationEnum)"
+          <el-option v-for="item of $d.Indication" v-show="indicationGrouping === item.raw.ChildGroup" :key="item.id"
-          v-model="trialForm.IndicationEnum"
+            :label="item.label" :value="item.value" />
        >
          <el-option
            v-for="item of $d.Indication"
            v-show="indicationGrouping === item.raw.ChildGroup"
            :key="item.id"
            :label="item.label"
            :value="item.value"
          />
        </el-select>
        <el-row v-if="[37, 38, 39].includes(trialForm.IndicationEnum)">
          <el-col :span="12">
-            <el-select
+            <el-select :disabled="!trialForm.IndicationTypeId" v-model="trialForm.IndicationEnum"
-              :disabled="!trialForm.IndicationTypeId"
+              style="width: 100%; margin-right: 10px">
-              v-model="trialForm.IndicationEnum"
+              <el-option v-for="item of $d.Indication" v-show="indicationGrouping === item.raw.ChildGroup"
-              style="width: 100%; margin-right: 10px"
+                :key="item.id" :label="item.label" :value="item.value" />
            >
              <el-option
                v-for="item of $d.Indication"
                v-show="indicationGrouping === item.raw.ChildGroup"
                :key="item.id"
                :label="item.label"
                :value="item.value"
              />
            </el-select>
          </el-col>
          <el-col :span="12">
-            <el-input
+            <el-input :disabled="!trialForm.IndicationTypeId" v-model="trialForm.Indication" />
              :disabled="!trialForm.IndicationTypeId"
              v-model="trialForm.Indication"
            />
          </el-col>
        </el-row>
      </el-form-item>
@ -232,99 +120,54 @@
            :label="item.Value"
            :value="item.Id"
          /> -->
-          <el-option
+          <el-option v-for="item of $d.Modality" :key="item.id" :label="item.label" :value="item.id" />
            v-for="item of $d.Modality"
            :key="item.id"
            :label="item.label"
            :value="item.id"
          />
        </el-select>
      </el-form-item>
      <!-- Sites -->
      <el-form-item :label="$t('trials:trials-list:form:siteCount')">
-        <el-input-number
+        <el-input-number v-model="trialForm.PlanSiteCount" controls-position="right" :min="0" />
          v-model="trialForm.PlanSiteCount"
          controls-position="right"
          :min="0"
        />
      </el-form-item>
    </el-row>
    <el-row>
      <!-- Expected Patients Num -->
      <el-form-item :label="$t('trials:trials-list:form:patientsNum')">
-        <el-input-number
+        <el-input-number v-model="trialForm.ExpectedPatients" controls-position="right" :min="0"
-          v-model="trialForm.ExpectedPatients"
+          @change="handleExpectedPatientsChange" />
          controls-position="right"
          :min="0"
          @change="handleExpectedPatientsChange"
        />
      </el-form-item>
      <!-- Timepoints Per Patient -->
      <el-form-item :label="$t('trials:trials-list:form:timePointsPerPatient')">
-        <el-input-number
+        <el-input-number v-model="trialForm.TimePointsPerPatient" controls-position="right" :min="0"
-          v-model="trialForm.TimePointsPerPatient"
+          @change="handleTpPerPatientChange" />
          controls-position="right"
          :min="0"
          @change="handleTpPerPatientChange"
        />
      </el-form-item>
    </el-row>
    <el-row>
      <!-- Visits -->
      <el-form-item :label="$t('trials:trials-list:form:visitCount')">
-        <el-input-number
+        <el-input-number v-model="trialForm.PlanVisitCount" controls-position="right" :min="0" />
          v-model="trialForm.PlanVisitCount"
          controls-position="right"
          :min="0"
        />
      </el-form-item>
    </el-row>
    <el-row>
      <!-- Expedited -->
-      <el-form-item
+      <el-form-item :label="$t('trials:trials-list:form:expedited')" prop="Expedited">
        :label="$t('trials:trials-list:form:expedited')"
        prop="Expedited"
      >
        <el-select v-model="trialForm.Expedited">
-          <el-option
+          <el-option v-for="item in expeditedOption" :key="item.value" :label="item.label" :value="item.value" />
            v-for="item in expeditedOption"
            :key="item.value"
            :label="item.label"
            :value="item.value"
          />
        </el-select>
      </el-form-item>
      <!-- Turnaround Time -->
-      <el-form-item
+      <el-form-item :label="$t('trials:trials-list:form:projectCycle')" prop="ProjectCycle">
        :label="$t('trials:trials-list:form:projectCycle')"
        prop="ProjectCycle"
      >
        <el-input v-model="trialForm.ProjectCycle" />
      </el-form-item>
    </el-row>
    <el-row>
      <!-- Total Reviewers -->
      <el-form-item :label="$t('trials:trials-list:form:totalReviewers')">
-        <el-input-number
+        <el-input-number v-model="trialForm.TotalReviewers" controls-position="right" :min="0" />
          v-model="trialForm.TotalReviewers"
          controls-position="right"
          :min="0"
        />
      </el-form-item>
      <!-- Type of Reviewers -->
      <el-form-item :label="$t('trials:trials-list:form:typeofReviewers')">
-        <el-select
+        <el-select v-model="trialForm.AttendedReviewerTypeEnumList" size="small" multiple clearable>
-          v-model="trialForm.AttendedReviewerTypeEnumList"
+          <el-option v-for="item of $d.AttendedReviewerType" :key="item.value" :value="item.value"
-          size="small"
+            :label="item.label" />
          multiple
          clearable
        >
          <el-option
            v-for="item of $d.AttendedReviewerType"
            :key="item.value"
            :value="item.value"
            :label="item.label"
          />
        </el-select>
        <!--        <el-row v-if="trialForm.AttendedReviewerTypeEnumList.includes(2)">-->
        <!--          <el-col :span="12">-->
@ -557,6 +400,7 @@ export default {
    },
    // 申办方与CRO新增
    async handleSelectChange(value, key) {
      if (!value) return false
      let arr = key == "sponsor" ? this.sponsorList : this.croList;
      let has = arr.some((item) => item.Id === value);
      if (!has) {
@ -788,6 +632,7 @@ export default {
 .trial-Form .el-textarea {
  width: 340px;
 }
 .trial-Form .el-col .el-input {
  width: 165px;
  margin-right: 10px;
--- a/src/views/trials/trials-myinfo/account.vue
+++ b/src/views/trials/trials-myinfo/account.vue
@ -5,135 +5,61 @@
        <!-- 账号信息 -->
        {{ $t('trials:trials-myinfo:title:accountInfo') }}
      </div>
-      <el-form
+      <el-form label-position="right" label-width="100px" :rules="rule" :model="userForm" ref="userFormRef">
        label-position="right"
        label-width="100px"
        :rules="rule"
        :model="userForm"
        ref="userFormRef"
      >
        <!-- 用户名 -->
-        <el-form-item
+        <el-form-item :label="$t('trials:trials-myinfo:form:userName')" style="margin-bottom: 5px">
          :label="$t('trials:trials-myinfo:form:userName')"
          style="margin-bottom: 5px"
        >
          <span>{{ user.UserName }}</span>
        </el-form-item>
        <el-form-item label="" style="position: relative" prop="UserName">
-          <el-input
+          <el-input v-model="userForm.UserName" :placeholder="$t('trials:trials-myinfo:form:userName')" />
            v-model="userForm.UserName"
            :placeholder="$t('trials:trials-myinfo:form:userName')"
          />
          <!-- 修改 -->
-          <el-button
+          <el-button :disabled="!userForm.UserName" class="saveBtn" type="primary" size="small" @click="setNewUserName">
            :disabled="!userForm.UserName"
            class="saveBtn"
            type="primary"
            size="small"
            @click="setNewUserName"
          >
            {{ $t('trials:trials-myinfo:button:update') }}
          </el-button>
        </el-form-item>
        <!-- 电话 -->
-        <el-form-item
+        <el-form-item :label="$t('trials:trials-myinfo:form:phone')" style="margin-bottom: 5px" prop="Phone">
          :label="$t('trials:trials-myinfo:form:phone')"
          style="margin-bottom: 5px"
          prop="Phone"
        >
          <span>{{ user.Phone }}</span>
        </el-form-item>
        <el-form-item label="" style="position: relative" prop="Phone">
-          <el-input
+          <el-input v-model="userForm.Phone" :placeholder="$t('trials:trials-myinfo:form:phone')" />
            v-model="userForm.Phone"
            :placeholder="$t('trials:trials-myinfo:form:phone')"
          />
          <!-- 修改 -->
-          <el-button
+          <el-button :disabled="!userForm.Phone" class="saveBtn" type="primary" size="small" @click="setNewPhone">
            :disabled="!userForm.Phone"
            class="saveBtn"
            type="primary"
            size="small"
            @click="setNewPhone"
          >
            {{ $t('trials:trials-myinfo:button:update') }}
          </el-button>
        </el-form-item>
        <!-- 邮箱 -->
-        <el-form-item
+        <el-form-item :label="$t('trials:trials-myinfo:form:email')" style="margin-bottom: 5px" prop="EMail">
          :label="$t('trials:trials-myinfo:form:email')"
          style="margin-bottom: 5px"
          prop="EMail"
        >
          <span>{{ user.EMail }}</span>
        </el-form-item>
-        <el-form-item
+        <el-form-item label="" style="margin-bottom: 10px; position: relative" prop="EMail" v-if="IsCanConnectInternet">
-          label=""
+          <el-input v-model="userForm.EMail" @input="handleEmailChange"
-          style="margin-bottom: 10px; position: relative"
+            :placeholder="$t('trials:trials-myinfo:form:email')" />
          prop="EMail"
          v-if="IsCanConnectInternet"
        >
          <el-input
            v-model="userForm.EMail"
            @input="handleEmailChange"
            :placeholder="$t('trials:trials-myinfo:form:email')"
          />
          <el-button
            class="sendCode"
            :disabled="sendDisabled"
            type="primary"
            size="mini"
            @click="sendVerificationCode"
            >{{ sendTitle }}</el-button
          >
        </el-form-item>
-        <el-form-item
+        <el-form-item label="" style="position: relative" prop="VerificationCode" v-if="IsCanConnectInternet">
-          label=""
+          <div style="display: flex;justify-content: space-between;width: 100%;">
-          style="position: relative"
+            <el-input v-model="userForm.VerificationCode" :placeholder="$t('trials:researchForm:form:verifyCode')" />
-          prop="VerificationCode"
+            <el-button class="codeBtn" :disabled="sendDisabled" size="mini" @click="sendVerificationCode">{{
-          v-if="IsCanConnectInternet"
+              sendTitle
-        >
+            }}</el-button>
-          <el-input
+          </div>
            v-model="userForm.VerificationCode"
            :placeholder="$t('trials:researchForm:form:verifyCode')"
          />
          <!-- 修改 -->
-          <el-button
+          <el-button :disabled="!userForm.EMail || !userForm.VerificationCode" class="saveBtn" type="primary"
-            :disabled="!userForm.EMail || !userForm.VerificationCode"
+            size="small" @click="setNewEmail">
            class="saveBtn"
            type="primary"
            size="small"
            @click="setNewEmail"
          >
            {{ $t('trials:trials-myinfo:button:update') }}
          </el-button>
        </el-form-item>
-        <el-form-item
+        <el-form-item :label="$t('trials:trials-myinfo:form:toggleRole')" style="position: relative"
-          :label="$t('trials:trials-myinfo:form:toggleRole')"
+          prop="VerificationCode" v-if="hasRole">
          style="position: relative"
          prop="VerificationCode"
          v-if="hasRole"
        >
          <el-radio-group v-model="userRoleId" class="roles" v-if="hasRole">
-            <el-radio
+            <el-radio v-for="item in roles" :key="item.Id" :label="item.Id" :disabled="item.IsUserRoleDisabled"
-              v-for="item in roles"
+              style="margin-bottom: 10px">
              :key="item.Id"
              :label="item.Id"
              :disabled="item.IsUserRoleDisabled"
              style="margin-bottom: 10px"
            >
              {{ item.UserTypeShortName }}
            </el-radio>
          </el-radio-group>
          <!-- 修改 -->
-          <el-button
+          <el-button :disabled="!userRoleId || saveDisabled" class="saveBtn" :loading="toggleRoleLoading" type="primary"
-            :disabled="!userRoleId || saveDisabled"
+            size="small" @click="toggleRole">
            class="saveBtn"
            :loading="toggleRoleLoading"
            type="primary"
            size="small"
            @click="toggleRole"
          >
            {{ $t('trials:trials-myinfo:button:toggleRole') }}
          </el-button>
        </el-form-item>
@ -189,11 +115,11 @@ export default {
                callback(
                  lang === 'zh'
                    ? new Error(
-                        '1）用户名字符长度最小为4个字符，最大为16个字符，只可使用字母、数字、下划线；'
+                      '1）用户名字符长度最小为4个字符，最大为16个字符，只可使用字母、数字、下划线；'
-                      )
+                    )
                    : new Error(
-                        'the username must have:1) At least 4 characters;2) At most 16 characters;3)Only letters, numbers, and underscores are allowed.'
+                      'the username must have:1) At least 4 characters;2) At most 16 characters;3)Only letters, numbers, and underscores are allowed.'
-                      )
+                    )
                )
              } else {
                callback()
@ -345,9 +271,26 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
 .codeBtn {
  color: #409EFF;
  border-color: #409EFF;
  margin-left: 10px;
 }
 .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;
 }
 .el-radio-group {
  margin-top: 12px;
 }
 .el-radio {
  width: 60px;
 }
--- a/src/views/trials/trials-panel/attachments/attachment-management/index.vue
+++ b/src/views/trials/trials-panel/attachments/attachment-management/index.vue
@ -39,7 +39,22 @@
          <el-input v-model="searchData.Name" clearable style="width: 120px" />
        </el-form-item>
        <!-- 签署人 -->
-        <el-form-item :label="$t('trials:signRecords:table:user')" v-if="!isDoc">
+        <el-form-item :label="$t('trials:signRecords:table:user')" v-if="!isSystem">
          <el-select v-model="searchData.UserId" clearable filterable style="width: 140px">
            <el-option v-for="item of userOptions" :key="item.UserId" :label="item.RealName" :value="item.UserId">
              <span style="float: left">{{ item.RealName || item.FullName }}</span>
              <span style="
                  float: right;
                  color: #8492a6;
                  font-size: 13px;
                  margin-left: 5px;
                ">
                {{ item.UserName }}
              </span>
            </el-option>
          </el-select>
        </el-form-item>
        <el-form-item :label="$t('trials:signRecords:table:user')" v-else-if="!isDoc">
          <el-select v-model="searchData.UserId" clearable filterable style="width: 140px">
            <el-option v-for="item of userOptions" :key="item.ConfirmUserId" :label="item.FullName"
              :value="item.ConfirmUserId">
--- a/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue
+++ b/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue
@ -4,176 +4,79 @@
      <el-form :inline="true">
        <!-- Name -->
        <el-form-item :label="$t('trials:seletctedReviews:table:name')">
-          <el-input
+          <el-input v-model="listQuery.Name" size="small" clearable style="width: 120px" />
            v-model="listQuery.Name"
            size="small"
            clearable
            style="width: 120px"
          />
        </el-form-item>
        <!-- Modality -->
        <el-form-item :label="$t('trials:seletctedReviews:form:modality')">
-          <el-select
+          <el-select v-model="listQuery.ReadingTypeIdList" class="handle-select" clearable multiple collapse-tags
-            v-model="listQuery.ReadingTypeIdList"
+            style="width: 160px">
-            class="handle-select"
+            <el-option v-for="item of $d.ReadingType" :key="item.id" :label="item.label" :value="item.id" />
            clearable
            multiple
            collapse-tags
            style="width: 160px"
          >
            <el-option
              v-for="item of $d.ReadingType"
              :key="item.id"
              :label="item.label"
              :value="item.id"
            />
          </el-select>
        </el-form-item>
        <!-- Subspeciality -->
        <el-form-item :label="$t('trials:seletctedReviews:form:subspeciality')">
-          <el-select
+          <el-select v-model="listQuery.SubspecialityIdList" class="handle-select" clearable multiple collapse-tags
-            v-model="listQuery.SubspecialityIdList"
+            style="width: 160px">
-            class="handle-select"
+            <el-option v-for="item of $d.Subspeciality" :key="item.id" :label="item.label" :value="item.id" />
            clearable
            multiple
            collapse-tags
            style="width: 160px"
          >
            <el-option
              v-for="item of $d.Subspeciality"
              :key="item.id"
              :label="item.label"
              :value="item.id"
            />
          </el-select>
        </el-form-item>
        <!-- Position -->
        <el-form-item :label="$t('trials:seletctedReviews:form:position')">
-          <el-select
+          <el-select v-model="listQuery.PositionId" class="handle-select" clearable style="width: 160px">
-            v-model="listQuery.PositionId"
+            <el-option v-for="item of $d.Position" :key="item.id" :label="item.label" :value="item.id" />
            class="handle-select"
            clearable
            style="width: 160px"
          >
            <el-option
              v-for="item of $d.Position"
              :key="item.id"
              :label="item.label"
              :value="item.id"
            />
          </el-select>
        </el-form-item>
        <!-- Rank -->
        <el-form-item :label="$t('trials:seletctedReviews:form:rank')">
-          <el-select
+          <el-select v-model="listQuery.RankId" class="handle-select" style="width: 160px" clearable>
-            v-model="listQuery.RankId"
+            <el-option v-for="item of $d.Rank" :key="item.id" :label="item.label" :value="item.id" />
            class="handle-select"
            style="width: 160px"
            clearable
          >
            <el-option
              v-for="item of $d.Rank"
              :key="item.id"
              :label="item.label"
              :value="item.id"
            />
          </el-select>
        </el-form-item>
        <!-- Institution -->
        <el-form-item :label="$t('trials:seletctedReviews:form:institution')">
-          <el-select
+          <el-select v-model="listQuery.HospitalId" class="handle-select mr10" clearable style="width: 160px">
-            v-model="listQuery.HospitalId"
+            <el-option v-for="(item, index) in hospitalList" :key="index" :label="item.HospitalName" :value="item.Id" />
            class="handle-select mr10"
            clearable
            style="width: 160px"
          >
            <el-option
              v-for="(item, index) in hospitalList"
              :key="index"
              :label="item.HospitalName"
              :value="item.Id"
            />
          </el-select>
        </el-form-item>
        <!-- 查询 -->
-        <el-button
+        <el-button type="primary" icon="el-icon-search" :loading="loading" @click="handleSearch">
          type="primary"
          icon="el-icon-search"
          :loading="loading"
          @click="handleSearch"
        >
          {{ $t('common:button:search') }}
        </el-button>
        <!-- 重置 -->
-        <el-button
+        <el-button type="primary" icon="el-icon-refresh-left" :loading="loading" @click="handleReset">
          type="primary"
          icon="el-icon-refresh-left"
          :loading="loading"
          @click="handleReset"
        >
          {{ $t('common:button:reset') }}
        </el-button>
-        <el-button
+        <el-button v-if="hasPermi(['role:pm'])" type="primary" :disabled="selectIdArr.length == 0" icon="el-icon-check"
-          v-if="hasPermi(['role:pm'])"
+          :loading="loading" @click="handleApply">
          type="primary"
          :disabled="selectIdArr.length == 0"
          icon="el-icon-check"
          :loading="loading"
          @click="handleApply"
        >
          {{ $t('trials:seletctedReviews:button:select') }}
        </el-button>
        <!---简历采集-->
-        <el-button
+        <el-button type="primary" @click="resumeCollection"
-          type="primary"
+          v-hasPermi="['trials:trials-panel:attachments:enrollment:viewer']">
          @click="resumeCollection"
          v-hasPermi="['trials:trials-panel:attachments:enrollment:viewer']"
        >
          {{ $t('trials:seletctedReviews:button:resumeCollection') }}
        </el-button>
        <!---添加阅片人-->
-        <el-button
+        <el-button icon="el-icon-plus" type="primary" @click="openViewer('add')"
-          icon="el-icon-plus"
+          v-hasPermi="['trials:trials-panel:attachments:enrollment:viewer']">
          type="primary"
          @click="openViewer('add')"
          v-hasPermi="['trials:trials-panel:attachments:enrollment:viewer']"
        >
          {{ $t('trials:seletctedReviews:button:addViewer') }}
        </el-button>
      </el-form>
    </template>
    <template slot="main-container">
-      <el-table
+      <el-table ref="selectionList" v-loading="listLoading" v-adaptive="{ bottomOffset: 65 }" height="100" :data="list"
-        ref="selectionList"
+        class="table" :row-class-name="handleHighLighRow" @sort-change="handleSortChange"
-        v-loading="listLoading"
+        @selection-change="handleSelectionChange">
        v-adaptive="{ bottomOffset: 65 }"
        height="100"
        :data="list"
        class="table"
        :row-class-name="handleHighLighRow"
        @sort-change="handleSortChange"
        @selection-change="handleSelectionChange"
      >
        <el-table-column type="selection" :selectable="handleSelectTable" />
        <el-table-column type="index" width="40" />
        <!-- Name -->
-        <el-table-column
+        <el-table-column prop="LastName" :label="$t('trials:seletctedReviews:table:name')" show-overflow-tooltip
-          prop="LastName"
+          width="120" sortable="custom">
          :label="$t('trials:seletctedReviews:table:name')"
          show-overflow-tooltip
          width="120"
          sortable="custom"
        >
          <template slot-scope="scope">
-            <span
+            <span style="color: #428bca; cursor: pointer" @click="
-              style="color: #428bca; cursor: pointer"
+              go(
-              @click="
+                `/trialsResume?doctorId=${scope.row.Id}&trialId=${$route.query.trialId}&token=${token}`
-                go(
+              )
-                  `/trialsResume?doctorId=${scope.row.Id}&trialId=${$route.query.trialId}&token=${token}`
+              ">{{ scope.row.LastName }} / {{ scope.row.FirstName }}</span>
                )
              "
              >{{ scope.row.LastName }} / {{ scope.row.FirstName }}</span
            >
            <!-- <el-button type="text" @click="go(`/trialsResume?doctorId=${scope.row.Id}&token=${token}`)">{{ scope.row.LastName }} / {{ scope.row.FirstName }}</el-button> -->
            <!--            <router-link-->
            <!--              style="color: #428bca;"-->
@ -186,28 +89,13 @@
          </template>
        </el-table-column>
        <!-- Name CN -->
-        <el-table-column
+        <el-table-column v-if="!isEN" prop="ChineseName" :label="$t('trials:seletctedReviews:table:nameCN')"
-          v-if="!isEN"
+          show-overflow-tooltip sortable="custom" width="120" />
          prop="ChineseName"
          :label="$t('trials:seletctedReviews:table:nameCN')"
          show-overflow-tooltip
          sortable="custom"
          width="120"
        />
-        <el-table-column
+        <el-table-column prop="DoctorUserName" :label="$t('trials:seletctedReviews:table:doctorUserName')"
-          prop="DoctorUserName"
+          show-overflow-tooltip sortable="custom" width="120" />
          :label="$t('trials:seletctedReviews:table:doctorUserName')"
          show-overflow-tooltip
          sortable="custom"
          width="120"
        />
        <!-- Status -->
-        <el-table-column
+        <el-table-column prop="DoctorTrialState" :label="$t('trials:seletctedReviews:table:status')" width="120">
          prop="DoctorTrialState"
          :label="$t('trials:seletctedReviews:table:status')"
          width="120"
        >
          <template slot-scope="scope">
            <el-tag v-if="scope.row.DoctorTrialState === 1" type="primary">{{
              $fd('DoctorTrialState', 16)
@ -215,35 +103,16 @@
          </template>
        </el-table-column>
        <!-- Submitted -->
-        <el-table-column
+        <el-table-column prop="Submitted" :label="$t('trials:seletctedReviews:table:submitted')" show-overflow-tooltip
-          prop="Submitted"
+          sortable="custom" width="140" />
          :label="$t('trials:seletctedReviews:table:submitted')"
          show-overflow-tooltip
          sortable="custom"
          width="140"
        />
        <!-- Approved -->
-        <el-table-column
+        <el-table-column prop="Approved" :label="$t('trials:seletctedReviews:table:approved')" show-overflow-tooltip
-          prop="Approved"
+          sortable="custom" width="120" />
          :label="$t('trials:seletctedReviews:table:approved')"
          show-overflow-tooltip
          sortable="custom"
          width="120"
        />
        <!-- Reading -->
-        <el-table-column
+        <el-table-column prop="Reading" :label="$t('trials:seletctedReviews:table:reading')" show-overflow-tooltip
-          prop="Reading"
+          sortable="custom" width="120" />
-          :label="$t('trials:seletctedReviews:table:reading')"
+        <el-table-column prop="Speciality" :label="$t('trials:seletctedReviews:form:modality')" show-overflow-tooltip
-          show-overflow-tooltip
+          min-width="120">
          sortable="custom"
          width="120"
        />
        <el-table-column
          prop="Speciality"
          :label="$t('trials:seletctedReviews:form:modality')"
          show-overflow-tooltip
          min-width="120"
        >
          <template slot-scope="scope">
            {{
              scope.row.ReadingTypeIds.map((v) => {
@ -253,12 +122,8 @@
          </template>
        </el-table-column>
        <!-- Specialty -->
-        <el-table-column
+        <el-table-column prop="Speciality" :label="$t('trials:seletctedReviews:table:specialty')" show-overflow-tooltip
-          prop="Speciality"
+          min-width="120">
          :label="$t('trials:seletctedReviews:table:specialty')"
          show-overflow-tooltip
          min-width="120"
        >
          <template slot-scope="scope">
            {{
              scope.row.SpecialityId === otherId
@ -270,12 +135,8 @@
          </template>
        </el-table-column>
        <!-- Subspecialty -->
-        <el-table-column
+        <el-table-column prop="Subspeciality" :label="$t('trials:seletctedReviews:table:subspecialty')"
-          prop="Subspeciality"
+          show-overflow-tooltip min-width="150">
          :label="$t('trials:seletctedReviews:table:subspecialty')"
          show-overflow-tooltip
          min-width="150"
        >
          <template slot-scope="scope">
            {{
              scope.row.SubspecialityIds.map((v) => {
@ -286,76 +147,42 @@
          </template>
        </el-table-column>
        <!-- Institution -->
-        <el-table-column
+        <el-table-column prop="HospitalName" :label="$t('trials:seletctedReviews:table:institution')"
-          prop="HospitalName"
+          show-overflow-tooltip width="150">
          :label="$t('trials:seletctedReviews:table:institution')"
          show-overflow-tooltip
          width="150"
        >
        <template slot-scope="scope">
          <span>{{ isEN?scope.row.HospitalName:scope.row.HospitalNameCN }}</span>
        </template>
      </el-table-column>
        <!-- City -->
        <el-table-column
          prop="City"
          :label="$t('trials:seletctedReviews:table:city')"
          show-overflow-tooltip
          width="150"
        >
        <template slot-scope="scope">
          <span>{{ isEN?scope.row.City:scope.row.CityCN }}</span>
        </template>
      </el-table-column>
        <!-- Country -->
        <el-table-column
          prop="Country"
          :label="$t('trials:seletctedReviews:table:country')"
          show-overflow-tooltip
          width="150"
        >
        <template slot-scope="scope">
          <span>{{ isEN?scope.row.Country:scope.row.CountryCN }}</span>
        </template>
      </el-table-column>
        <!-- Selector -->
        <el-table-column
          prop="OptUserName"
          :label="$t('trials:seletctedReviews:table:selector')"
          width="150"
        />
        <!-- Selection Time -->
        <el-table-column
          prop="OptTimeStr"
          :label="$t('trials:seletctedReviews:table:selectionTime')"
          width="150"
        />
        <el-table-column
          fixed="right"
          prop="OptTimeStr"
          :label="$t('common:action:action')"
          width="150"
          v-if="hasPermi(['trials:trials-panel:attachments:enrollment:viewer'])"
        >
          <template slot-scope="scope">
-            <el-button
+            <span>{{ isEN ? scope.row.HospitalName : scope.row.HospitalNameCN }}</span>
-              icon="el-icon-edit-outline"
+          </template>
-              :title="$t('common:button:edit')"
+        </el-table-column>
        <!-- City -->
        <el-table-column prop="City" :label="$t('trials:seletctedReviews:table:city')" show-overflow-tooltip
          width="150">
          <template slot-scope="scope">
            <span>{{ isEN ? scope.row.City : scope.row.CityCN }}</span>
          </template>
        </el-table-column>
        <!-- Country -->
        <el-table-column prop="Country" :label="$t('trials:seletctedReviews:table:country')" show-overflow-tooltip
          width="150">
          <template slot-scope="scope">
            <span>{{ isEN ? scope.row.Country : scope.row.CountryCN }}</span>
          </template>
        </el-table-column>
        <!-- Selector -->
        <el-table-column prop="OptUserName" :label="$t('trials:seletctedReviews:table:selector')" width="150" />
        <!-- Selection Time -->
        <el-table-column prop="OptTimeStr" :label="$t('trials:seletctedReviews:table:selectionTime')" width="150" />
        <el-table-column fixed="right" prop="OptTimeStr" :label="$t('common:action:action')" width="150"
          v-if="hasPermi(['trials:trials-panel:attachments:enrollment:viewer'])">
          <template slot-scope="scope">
            <el-button icon="el-icon-edit-outline" :title="$t('common:button:edit')"
              @click.stop="openViewer('edit', scope.row)"
-              v-hasPermi="['trials:trials-panel:attachments:enrollment:viewer']"
+              v-hasPermi="['trials:trials-panel:attachments:enrollment:viewer']" :disabled="scope.row.IsEnroll"
-              :disabled="scope.row.IsEnroll"
+              circle />
              circle
            />
          </template>
        </el-table-column>
      </el-table>
-      <pagination
+      <pagination class="page" :total="total" :page.sync="listQuery.PageIndex" :limit.sync="listQuery.PageSize"
-        class="page"
+        @pagination="getList" />
        :total="total"
        :page.sync="listQuery.PageIndex"
        :limit.sync="listQuery.PageSize"
        @pagination="getList"
      />
    </template>
    <!--简历采集-->
    <base-model :config="share_model">
@ -365,14 +192,8 @@
          <span>{{ $t('reviewers-list:message:msg1') }}</span>
        </div>
        <div style="margin: 10px 0">
-          <span style="">{{ $t('reviewers-list:message:msg2') }}</span
+          <span style="">{{ $t('reviewers-list:message:msg2') }}</span><el-input type="textarea"
-          ><el-input
+            :autosize="{ minRows: 2, maxRows: 4 }" v-model="shareLink" readonly style="width: 100%; margin-top: 10px" />
            type="textarea"
            :autosize="{ minRows: 2, maxRows: 4 }"
            v-model="shareLink"
            readonly
            style="width: 100%; margin-top: 10px"
          />
        </div>
        <div>
          <el-button type="primary" round @click="copyCode">{{
@ -380,80 +201,34 @@
          }}</el-button>
        </div>
        <div class="sendEmailBox">
-          <el-input
+          <el-input v-model="email" clearable :placeholder="$t('reviewers-list:placeholder:sendEmail')"></el-input>
-            v-model="email"
+          <el-button type="primary" round :disabled="!email" @click="sendEmail" :loading="emailLoading"
-            clearable
+            style="margin-left: 10px">
            :placeholder="$t('reviewers-list:placeholder:sendEmail')"
          ></el-input>
          <el-button
            type="primary"
            round
            :disabled="!email"
            @click="sendEmail"
            :loading="emailLoading"
            style="margin-left: 10px"
          >
            {{ $t('reviewers-list:button:sendEmail') }}
          </el-button>
        </div>
      </template>
    </base-model>
    <!--新增或修改简历-->
-    <el-dialog
+    <el-dialog :title="$t('curriculumVitae:content:title')" :visible.sync="visible" fullscreen v-if="visible"
-      :title="$t('curriculumVitae:content:title')"
+      appendToBody :before-close="beforeClose">
      :visible.sync="visible"
      fullscreen
      v-if="visible"
      appendToBody
      :before-close="beforeClose"
    >
      <curriculumVitae :reviewerId="reviewerId" />
    </el-dialog>
    <!--新增阅片人输入邮箱--->
-    <el-dialog
+    <el-dialog :title="$t('curriculumVitae:content:title')" :visible.sync="emailVisible" v-if="emailVisible"
-      :title="$t('curriculumVitae:content:title')"
+      appendToBody :close-on-click-modal="false" v-dialogDrag width="400px">
-      :visible.sync="emailVisible"
+      <el-form v-if="emailVisible" ref="emailForm" :model="emailForm" :rules="emailRule" class="demo-form-inline"
-      v-if="emailVisible"
+        label-width="80px">
-      appendToBody
+        <el-form-item :label="$t('trials:trials-panel:attachments:enrollment:form:email')" prop="EmailOrPhone">
-      :close-on-click-modal="false"
+          <el-input v-model="emailForm.EmailOrPhone" clearable :maxlength="400"></el-input>
-      v-dialogDrag
+          <el-input style="display: none" v-model="emailForm.EmailOrPhone" clearable :maxlength="400"></el-input>
      width="400px"
    >
      <el-form
        v-if="emailVisible"
        ref="emailForm"
        :model="emailForm"
        :rules="emailRule"
        class="demo-form-inline"
        label-width="80px"
      >
        <el-form-item
          :label="$t('trials:trials-panel:attachments:enrollment:form:email')"
          prop="EmailOrPhone"
        >
          <el-input
            v-model="emailForm.EmailOrPhone"
            clearable
            :maxlength="400"
          ></el-input>
          <el-input
            style="display: none"
            v-model="emailForm.EmailOrPhone"
            clearable
            :maxlength="400"
          ></el-input>
        </el-form-item>
      </el-form>
      <span slot="footer" class="dialog-footer">
        <el-button size="small" type="primary" @click="handleCancle">
          {{ $t('common:button:cancel') }}
        </el-button>
-        <el-button
+        <el-button size="small" type="primary" @click="handleSave" :loading="emailLoading">
          size="small"
          type="primary"
          @click="handleSave"
          :loading="emailLoading"
        >
          {{ $t('common:button:save') }}
        </el-button>
      </span>
@ -482,8 +257,8 @@ const getListQueryDefault = () => {
    HospitalId: '',
    Asc: false,
    SortField: '',
-    AcceptingNewTrial: true,
+    // AcceptingNewTrial: true,
-    InformationConfirmed: true,
+    // InformationConfirmed: true,
    ContractorStatus: 1,
  }
 }
@ -583,7 +358,7 @@ export default {
    },
    copyCode() {
      this.$copyText(
-        `${this.$t('reviewers-list:button:copyCode')}: ${this.shareLink}`
+        `${this.$t('reviewers-list:message:msg1')}: ${this.shareLink}`
      )
        .then((res) => {
          this.$message.success(
@ -707,7 +482,7 @@ export default {
      }
    },
    handleSelectTable(row) {
-      return row.DoctorTrialState !== 1
+      return row.DoctorTrialState !== 1 && row.ResumeStatus === 1 && row.AcceptingNewTrial && !row.IsVirtual && !row.IsVacation && row.CooperateStatus === 1
    },
    handleDetail(row) {
      const { href } = this.$router.resolve({
@ -733,8 +508,8 @@ export default {
  align-items: center;
  justify-content: space-between;
 }
 ::v-deep .el-card__body {
  padding: 20px !important;
 }
 </style>
--- a/src/views/trials/trials-panel/attachments/site-research/components/ImageManual.vue
+++ b/src/views/trials/trials-panel/attachments/site-research/components/ImageManual.vue
@ -0,0 +1,230 @@
 <template>
    <div class="ImageManual">
        <div class="config">
            <div style="margin-bottom: 20px;font-weight: bold;">
                {{ $t("trials:researchRecord:ImageManual:BasicQuestion") }}
            </div>
            <el-form size="small" :model="form" style="width:80%">
                <el-form-item>
                    <el-checkbox v-model="form.AverageEngravingCycle">
                        {{ $t('trials:researchForm:form:engravingCycle') }}
                    </el-checkbox>
                </el-form-item>
                <el-form-item>
                    <el-checkbox v-model="form.IsConfirmImagingTechnologist"
                        @change="(val) => handleChange(val, 'IsConfirmImagingTechnologist')">
                        {{ $t('trials:researchForm:form:isQualified') }}
                    </el-checkbox>
                </el-form-item>
                <el-form-item>
                    <el-checkbox v-model="form.EfficacyEvaluatorType">
                        {{ $t('trials:researchForm:form:staffType') }}
                    </el-checkbox>
                </el-form-item>
                <el-form-item>
                    <el-checkbox v-model="form.IsFollowStudyParameters"
                        @change="(val) => handleChange(val, 'IsFollowStudyParameters')">
                        <span v-html="$t('trials:researchForm:form:isFollowStudyParam')"></span>
                    </el-checkbox>
                </el-form-item>
            </el-form>
            <div style="margin-bottom: 20px;font-weight: bold;">
                {{ $t("trials:researchRecord:ImageManual:TableConfiguration") }}
            </div>
            <el-form size="small" :model="form" style="width:80%">
                <el-form-item :label="$t('trials:researchRecord:ImageManual:Equipment')">
                    <el-radio-group v-model="form.IsCloseEquipmentSurvey">
                        <el-radio :label="item.value" v-for="item in $d.YesOrNo" :key="item.id">{{ item.label
                            }}</el-radio>
                    </el-radio-group>
                </el-form-item>
            </el-form>
            <div style="margin-bottom: 20px;font-weight: bold;">
                {{ $t("trials:researchRecord:ImageManual:Precautions") }}
            </div>
            <el-input type="textarea" :autosize="{ minRows: 4, maxRows: 99 }" placeholder=""
                v-model="form.ReplaceContent" @input="handleInput" style="width: 70%;" />
            <div style="text-align: right;margin: 20px;" class="btnBox">
                <el-button type="primary" :loading="loading" size="small" @click="handleSave">
                    {{ $t('common:button:save') }}
                </el-button>
            </div>
        </div>
        <div class="preview">
            <researchForm ref="ResearchForm" :trialSiteSurveyId="trialSiteSurveyId" />
        </div>
    </div>
 </template>
 <script>
 import researchForm from '@/views/research/components/ResearchForm'
 import { updateTrialExtralConfig, getTrialExtralConfig, getTrialDocumentList } from "@/api/trials"
 export default {
    name: "ImageManual",
    components: { researchForm },
    props: {
        trialSiteSurveyId: {
            type: String,
            default: ''
        }
    },
    data() {
        return {
            form: {
                AverageEngravingCycle: false,
                IsConfirmImagingTechnologist: false,
                NotConfirmReson: false,
                EfficacyEvaluatorType: false,
                IsFollowStudyParameters: false,
                NotFollowReson: false,
                ReplaceContent: '',
                ReplaceContentCN: '',
                IsOpenLostVistRead: false,
                IsSupportQCDownloadImage: false,
                IsCloseEquipmentSurvey: true
            },
            obj: {
                AverageEngravingCycle: false,
                IsConfirmImagingTechnologist: false,
                NotConfirmReson: false,
                EfficacyEvaluatorType: false,
                IsFollowStudyParameters: false,
                NotFollowReson: false,
            },
            loading: false
        }
    },
    mounted() {
        this.getInfo()
    },
    methods: {
        handleChange(val, key) {
            if (key === 'IsConfirmImagingTechnologist') this.form.NotConfirmReson = val
            if (key === 'IsFollowStudyParameters') this.form.NotFollowReson = val
        },
        handleInput(val) {
            this.form.ReplaceContentCN = val
        },
        async getInfo() {
            try {
                let param = {
                    TrialId: this.$route.query.trialId
                }
                let res = await getTrialExtralConfig(param)
                if (res.IsSuccess) {
                    Object.keys(this.form).forEach(key => {
                        this.form[key] = true
                        if (key === 'ReplaceContent' || key === 'ReplaceContentCN') this.form[key] = ''
                    })
                    this.form.IsOpenLostVistRead = res.Result.IsOpenLostVistRead
                    this.form.IsSupportQCDownloadImage = res.Result.IsSupportQCDownloadImage
                    this.form.IsCloseEquipmentSurvey = !res.Result.IsCloseEquipmentSurvey
                    if (Array.isArray(res.Result.NotShowFieldList) && res.Result.NotShowFieldList.length > 0) {
                        res.Result.NotShowFieldList.forEach(key => {
                            this.form[key] = false
                        })
                    }
                    if (Array.isArray(res.Result.ModifyFiledList) && res.Result.ModifyFiledList.length > 0) {
                        this.form.ReplaceContent = res.Result.ModifyFiledList[0].ReplaceContent.split('<p>').join('').split('</p>').filter(item => isNaN(item)).join("\n")
                        this.form.ReplaceContentCN = res.Result.ModifyFiledList[0].ReplaceContentCN.split('<p>').join('').split('</p>').filter(item => isNaN(item)).join("\n")
                    } else {
                        let arr = [this.$t('trials:equiptResearch:form:item1'), this.$t('trials:equiptResearch:form:item2'), this.$t('trials:equiptResearch:form:item3'), this.$t('trials:equiptResearch:form:item4')]
                        this.form.ReplaceContent = arr.join("\n")
                        this.form.ReplaceContentCN = arr.join("\n")
                    }
                }
            } catch (err) {
                console.log(err)
            }
        },
        async getTrialDocumentList() {
            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) this.$confirm(this.$t("trials:researchRecord:ImageManual:message:noImageManual"), this.$t('system:menu:confirm:title:warning'), {
                        type: 'warning'
                    })
                }
            } catch (err) {
                console.log(err)
            }
        },
        async handleSave() {
            try {
                let param = {
                    TrialId: this.$route.query.trialId
                }
                let data = {
                    IsOpenLostVistRead: this.form.IsOpenLostVistRead,
                    IsSupportQCDownloadImage: this.form.IsSupportQCDownloadImage,
                    IsCloseEquipmentSurvey: !this.form.IsCloseEquipmentSurvey,
                    ModifyFiledList: [],
                    NotShowFieldList: []
                }
                Object.keys(this.obj).forEach(key => {
                    if (!this.form[key]) data.NotShowFieldList.push(key)
                })
                let ReplaceContent = ''
                this.form.ReplaceContent.split("\n").forEach(item => {
                    ReplaceContent += `<p>${item}</p>`
                })
                let ReplaceContentCN = ''
                this.form.ReplaceContentCN.split("\n").forEach(item => {
                    ReplaceContentCN += `<p>${item}</p>`
                })
                let obj = {
                    NeedModifyFiled: 'SiteSurveyNote',
                    ReplaceContent: ReplaceContent,
                    ReplaceContentCN: ReplaceContentCN,
                }
                data.ModifyFiledList.push(obj)
                this.loading = true
                let res = await updateTrialExtralConfig(param, data)
                this.loading = false
                if (res.IsSuccess) {
                    this.$refs.ResearchForm.initPage()
                    if (!data.NotShowFieldList.includes('IsFollowStudyParameters')) this.getTrialDocumentList()
                }
            } catch (err) {
                this.loading = false
                console.log(err)
            }
        }
    }
 }
 </script>
 <style lang="scss" scoped>
 .ImageManual {
    width: 100%;
    height: 100%;
    display: flex;
    position: relative;
    .config,
    .preview {
        width: 65%;
        height: 100%;
        overflow-y: auto;
    }
    .config {
        width: 35%;
        border-right: 1px solid #EBEEF5;
    }
    ::v-deep .el-checkbox__label {
        white-space: normal;
        i {}
    }
 }
 </style>
--- a/src/views/trials/trials-panel/attachments/site-research/index.vue
+++ b/src/views/trials/trials-panel/attachments/site-research/index.vue
@ -5,127 +5,62 @@
      <el-form :inline="true">
        <!-- 中心 -->
        <el-form-item :label="$t('trials:researchRecord:table:siteId')">
-          <el-select
+          <el-select v-model="searchData.TrialSiteId" clearable filterable style="width: 120px">
-            v-model="searchData.TrialSiteId"
+            <el-option v-for="(item, index) of siteOptions" :key="index" :label="item.TrialSiteCode"
-            clearable
+              :value="item.TrialSiteId" />
            filterable
            style="width: 120px"
          >
            <el-option
              v-for="(item, index) of siteOptions"
              :key="index"
              :label="item.TrialSiteCode"
              :value="item.TrialSiteId"
            />
          </el-select>
        </el-form-item>
        <!-- 联系人 -->
        <el-form-item :label="$t('trials:researchRecord:table:contactor')">
-          <el-input
+          <el-input v-model="searchData.UserKeyInfo" class="mr" clearable :placeholder="`${$t(
-            v-model="searchData.UserKeyInfo"
+            'trials:researchRecord:placeholder:contactorInfo'
-            class="mr"
+          )}`" style="width: 140px" />
            clearable
            :placeholder="`${$t(
              'trials:researchRecord:placeholder:contactorInfo'
            )}`"
            style="width: 140px"
          />
        </el-form-item>
        <!-- 初审人 -->
-        <el-form-item
+        <el-form-item :label="$t('trials:researchRecord:table:preliminaryUser')">
-          :label="$t('trials:researchRecord:table:preliminaryUser')"
+          <el-input v-model="searchData.PreliminaryUserName" class="mr" clearable style="width: 140px" />
        >
          <el-input
            v-model="searchData.PreliminaryUserName"
            class="mr"
            clearable
            style="width: 140px"
          />
        </el-form-item>
        <!-- 审核人 -->
        <el-form-item :label="$t('trials:researchRecord:table:ReviewerUser')">
-          <el-input
+          <el-input v-model="searchData.ReviewerUserName" class="mr" clearable style="width: 140px" />
            v-model="searchData.ReviewerUserName"
            class="mr"
            clearable
            style="width: 140px"
          />
        </el-form-item>
        <!-- 状态 -->
        <el-form-item :label="$t('trials:researchRecord:table:status')">
-          <el-select
+          <el-select v-model="searchData.State" clearable filterable style="width: 120px">
-            v-model="searchData.State"
+            <el-option v-for="(item, index) of $d.ResearchRecord" :key="index" :label="item.label"
-            clearable
+              :value="item.value" />
            filterable
            style="width: 120px"
          >
            <el-option
              v-for="(item, index) of $d.ResearchRecord"
              :key="index"
              :label="item.label"
              :value="item.value"
            />
          </el-select>
        </el-form-item>
        <!-- 是否废除 -->
        <el-form-item :label="$t('trials:researchRecord:table:isDeleted')">
-          <el-select
+          <el-select v-model="searchData.IsDeleted" clearable filterable style="width: 120px">
-            v-model="searchData.IsDeleted"
+            <el-option v-for="item of $d.YesOrNo" v-show="item.raw.ValueCN !== '无'" :key="`IsDeleted${item.value}`"
-            clearable
+              :label="item.label" :value="item.value" />
            filterable
            style="width: 120px"
          >
            <el-option
              v-for="item of $d.YesOrNo"
              v-show="item.raw.ValueCN !== '无'"
              :key="`IsDeleted${item.value}`"
              :label="item.label"
              :value="item.value"
            />
          </el-select>
        </el-form-item>
        <!-- 更新时间 -->
        <el-form-item :label="$t('trials:researchRecord:table:updateTime')">
-          <el-date-picker
+          <el-date-picker v-model="searchData.DateRange" type="daterange" value-format="yyyy-MM-dd" format="yyyy-MM-dd"
-            v-model="searchData.DateRange"
+            style="width: 250px" />
            type="daterange"
            value-format="yyyy-MM-dd"
            format="yyyy-MM-dd"
            style="width: 250px"
          />
        </el-form-item>
        <!-- 查询 -->
        <el-button type="primary" icon="el-icon-search" @click="handleSearch">
          {{ $t('common:button:search') }}
        </el-button>
        <!-- 重置 -->
-        <el-button
+        <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
          type="primary"
          icon="el-icon-refresh-left"
          @click="handleReset"
        >
          {{ $t('common:button:reset') }}
        </el-button>
        <!-- 中心人员 -->
-        <el-button
+        <el-button v-hasPermi="[
-          v-hasPermi="[
+          'trials:trials-panel:attachments:site-research:summary-record',
-            'trials:trials-panel:attachments:site-research:summary-record',
+        ]" type="primary" icon="el-icon-info" @click="showResearchUser">
          ]"
          type="primary"
          icon="el-icon-info"
          @click="showResearchUser"
        >
          {{ $t('trials:researchRecord:button:questionStaffs') }}
        </el-button>
        <!-- 调查表链接 -->
-        <el-button
+        <el-button v-hasPermi="[
-          v-hasPermi="[
+          'trials:trials-panel:attachments:site-research:questionnaire-link',
-            'trials:trials-panel:attachments:site-research:questionnaire-link',
+        ]" type="primary" icon="el-icon-link" @click="showResearchLink">
          ]"
          type="primary"
          icon="el-icon-link"
          @click="showResearchLink"
        >
          {{ $t('trials:researchRecord:button:questionLink') }}
        </el-button>
      </el-form>
@ -133,61 +68,27 @@
    <template slot="main-container">
      <!-- 系统文件列表 -->
-      <el-table
+      <el-table ref="siteResearchList" v-loading="loading" v-adaptive="{ bottomOffset: 60 }" :data="list" stripe
-        ref="siteResearchList"
+        height="100" @sort-change="handleSortByColumn">
        v-loading="loading"
        v-adaptive="{ bottomOffset: 60 }"
        :data="list"
        stripe
        height="100"
        @sort-change="handleSortByColumn"
      >
        <el-table-column type="index" width="50" />
        <!-- 中心编号 -->
-        <el-table-column
+        <el-table-column prop="TrialSiteCode" :label="$t('trials:researchRecord:table:siteId')" min-width="100"
-          prop="TrialSiteCode"
+          sortable="custom" show-overflow-tooltip />
          :label="$t('trials:researchRecord:table:siteId')"
          min-width="100"
          sortable="custom"
          show-overflow-tooltip
        />
        <!-- 中心名称 -->
-        <el-table-column
+        <el-table-column prop="SiteName" :label="$t('trials:researchRecord:table:siteName')" min-width="100"
-          prop="SiteName"
+          sortable="custom" show-overflow-tooltip />
          :label="$t('trials:researchRecord:table:siteName')"
          min-width="100"
          sortable="custom"
          show-overflow-tooltip
        />
        <!-- 联系人 -->
-        <el-table-column
+        <el-table-column prop="UserName" :label="$t('trials:researchRecord:table:contactor')" min-width="100"
-          prop="UserName"
+          sortable="custom" show-overflow-tooltip />
          :label="$t('trials:researchRecord:table:contactor')"
          min-width="100"
          sortable="custom"
          show-overflow-tooltip
        />
        <!-- 联系电话 -->
-        <el-table-column
+        <el-table-column prop="Phone" :label="$t('trials:researchRecord:table:contactorPhone')" min-width="100"
-          prop="Phone"
+          show-overflow-tooltip />
          :label="$t('trials:researchRecord:table:contactorPhone')"
          min-width="100"
          show-overflow-tooltip
        />
        <!-- 联系邮箱 -->
-        <el-table-column
+        <el-table-column prop="Email" :label="$t('trials:researchRecord:table:contactorEmail')" min-width="150"
-          prop="Email"
+          show-overflow-tooltip />
          :label="$t('trials:researchRecord:table:contactorEmail')"
          min-width="150"
          show-overflow-tooltip
        />
        <!-- 初审人 -->
-        <el-table-column
+        <el-table-column prop="preliminaryUser" :label="$t('trials:researchRecord:table:preliminaryUser')"
-          prop="preliminaryUser"
+          min-width="150" show-overflow-tooltip>
          :label="$t('trials:researchRecord:table:preliminaryUser')"
          min-width="150"
          show-overflow-tooltip
        >
          <template slot-scope="scope">
            {{
              scope.row.PreliminaryUser
@ -197,24 +98,15 @@
          </template>
        </el-table-column>
        <!-- 审核人 -->
-        <el-table-column
+        <el-table-column prop="ReviewerUser" :label="$t('trials:researchRecord:table:ReviewerUser')" min-width="150"
-          prop="ReviewerUser"
+          show-overflow-tooltip>
          :label="$t('trials:researchRecord:table:ReviewerUser')"
          min-width="150"
          show-overflow-tooltip
        >
          <template slot-scope="scope">
            {{ scope.row.ReviewerUser ? scope.row.ReviewerUser.RealName : '' }}
          </template>
        </el-table-column>
        <!-- 状态 -->
-        <el-table-column
+        <el-table-column prop="State" :label="$t('trials:researchRecord:table:status')" min-width="150"
-          prop="State"
+          sortable="custom" show-overflow-tooltip>
          :label="$t('trials:researchRecord:table:status')"
          min-width="150"
          sortable="custom"
          show-overflow-tooltip
        >
          <template slot-scope="scope">
            <el-tag v-if="scope.row.State === 0" type="primary">{{
              $fd('ResearchRecord', scope.row.State)
@ -231,13 +123,8 @@
          </template>
        </el-table-column>
        <!-- 是否废除 -->
-        <el-table-column
+        <el-table-column prop="IsDeleted" :label="$t('trials:researchRecord:table:isDeleted')" min-width="100"
-          prop="IsDeleted"
+          sortable="custom" show-overflow-tooltip>
          :label="$t('trials:researchRecord:table:isDeleted')"
          min-width="100"
          sortable="custom"
          show-overflow-tooltip
        >
          <template slot-scope="scope">
            <el-tag v-if="scope.row.IsDeleted" type="danger">{{
              $fd('YesOrNo', scope.row.IsDeleted)
@ -248,88 +135,59 @@
          </template>
        </el-table-column>
        <!-- 更新时间 -->
-        <el-table-column
+        <el-table-column prop="UpdateTime" :label="$t('trials:researchRecord:table:updateTime')" min-width="150"
-          prop="UpdateTime"
+          show-overflow-tooltip sortable="custom" />
          :label="$t('trials:researchRecord:table:updateTime')"
          min-width="150"
          show-overflow-tooltip
          sortable="custom"
        />
        <el-table-column width="150">
          <template slot-scope="scope">
            <!-- 查看 -->
-            <el-button
+            <el-button :disabled="scope.row.State !== 3" circle :title="$t('common:button:view')" icon="el-icon-view"
-              :disabled="scope.row.State !== 3"
+              @click="handleViewResearchList(scope.row)" />
              circle
              :title="$t('common:button:view')"
              icon="el-icon-view"
              @click="handleViewResearchList(scope.row)"
            />
            <!-- 审批 -->
-            <el-button
+            <el-button v-hasPermi="[
-              v-hasPermi="[
+              'trials:trials-panel:attachments:site-research:auidt',
-                'trials:trials-panel:attachments:site-research:auidt',
+            ]" :disabled="scope.row.State === 0 || scope.row.State === 3 || scope.row.IsDeleted" circle
-              ]"
+              :title="$t('trials:researchRecord:action:view')" icon="el-icon-s-check"
-              :disabled="scope.row.State === 0 || scope.row.State === 3 || scope.row.IsDeleted"
+              @click="handleViewResearchList(scope.row)" />
              circle
              :title="$t('trials:researchRecord:action:view')"
              icon="el-icon-s-check"
              @click="handleViewResearchList(scope.row)"
            />
            <!-- 废除 -->
-            <el-button
+            <el-button v-hasPermi="[
-              v-hasPermi="[
+              'trials:trials-panel:attachments:site-research:abolish',
-                'trials:trials-panel:attachments:site-research:abolish',
+            ]" :disabled="scope.row.State !== 0 || scope.row.IsDeleted" circle
-              ]"
+              :title="$t('trials:researchRecord:action:abolish')" icon="el-icon-delete"
-              :disabled="scope.row.State !== 0 || scope.row.IsDeleted"
+              @click="handleRepealResearch(scope.row)" />
              circle
              :title="$t('trials:researchRecord:action:abolish')"
              icon="el-icon-delete"
              @click="handleRepealResearch(scope.row)"
            />
          </template>
        </el-table-column>
      </el-table>
      <!-- 分页组件 -->
-      <pagination
+      <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
-        class="page"
+        @pagination="getList" />
        :total="total"
        :page.sync="searchData.PageIndex"
        :limit.sync="searchData.PageSize"
        @pagination="getList"
      />
    </template>
    <!-- 中心人员 -->
-    <el-dialog
+    <el-dialog v-if="researchUserVisible" :visible.sync="researchUserVisible"
-      v-if="researchUserVisible"
+      :title="$t('trials:researchRecord:dialogTitle:questionStaff')" custom-class="base-dialog-wrapper"
-      :visible.sync="researchUserVisible"
+      :fullscreen="true">
-      :title="$t('trials:researchRecord:dialogTitle:questionStaff')"
+      <div class="base-modal-body" style="border: 1px solid #ccc; padding: 10px">
      custom-class="base-dialog-wrapper"
      :fullscreen="true"
    >
      <div
        class="base-modal-body"
        style="border: 1px solid #ccc; padding: 10px"
      >
        <Users v-if="researchUserVisible" />
      </div>
    </el-dialog>
    <!-- 调查表 -->
-    <el-dialog
+    <el-dialog v-if="researchInfoVisible" :visible.sync="researchInfoVisible" :fullscreen="true"
-      v-if="researchInfoVisible"
+      :close-on-click-modal="false">
      :visible.sync="researchInfoVisible"
      :fullscreen="true"
      :close-on-click-modal="false"
    >
      <research-form v-if="researchInfoVisible" @refreshPage="getList" />
    </el-dialog>
-
+    <!-- 调查表编辑 -->
    <el-dialog v-if="ImageManualVisible" :visible.sync="ImageManualVisible" :fullscreen="true"
      :close-on-click-modal="false" :title="$t('trials:researchRecord:dialogTitle:ImageManualEdit')">
      <ImageManual v-if="ImageManualVisible" :trialSiteSurveyId="trialSiteSurveyId" @getList="getList" />
    </el-dialog>
    <!-- 调查表链接 -->
    <base-model :config="share_model">
      <template slot="dialog-body">
        <el-button size="small" type="primary" style="margin-bottom: 10px;" @click.stop="openImageManual">{{
          $t('trials:researchRecord:label:edit')
        }}</el-button>
        <div style="width: 100%; display: flex">
          <div class="shareLink">
            <!-- <div>
@ -341,22 +199,11 @@
            <div style="margin: 10px 0">
              <!-- 链接： -->
              {{ $t('trials:researchRecord:label:link') }}
-              <el-input
+              <el-input ref="shareLink" v-model="shareLink" readonly type="textarea" autosize />
                ref="shareLink"
                v-model="shareLink"
                readonly
                type="textarea"
                autosize
              />
            </div>
            <div>
              <!-- 复制链接 -->
-              <el-button
+              <el-button type="primary" round @click="copyLink" class="shareLinkBtn">
                type="primary"
                round
                @click="copyLink"
                class="shareLinkBtn"
              >
                {{ $t('trials:researchRecord:button:copyLink') }}
              </el-button>
            </div>
@ -391,6 +238,7 @@ import Pagination from '@/components/Pagination'
 import Users from './components/users'
 import ResearchForm from '@/views/research/form'
 import BaseModel from '@/components/BaseModel'
 import ImageManual from './components/ImageManual'
 import QRCode from 'qrcodejs2'
 const searchDataDefault = () => {
@ -410,7 +258,7 @@ const searchDataDefault = () => {
 }
 export default {
  name: 'SiteResearchList',
-  components: { BaseContainer, Pagination, Users, ResearchForm, BaseModel },
+  components: { BaseContainer, Pagination, Users, ResearchForm, BaseModel, ImageManual },
  data() {
    return {
      searchData: searchDataDefault(),
@ -429,6 +277,9 @@ export default {
      shareLink: '',
      researchState: this.$d.ResearchRecord,
      qrcode: null,
      ImageManualVisible: false,
      trialSiteSurveyId: null
    }
  },
  mounted() {
@ -436,6 +287,10 @@ export default {
    this.getSite()
  },
  methods: {
    openImageManual() {
      // if (!this.trialSiteSurveyId) return false
      this.ImageManualVisible = true
    },
    // 获取系统文件数据
    getList() {
      this.loading = true
@ -488,8 +343,7 @@ export default {
    copyLink() {
      // 中心调研表链接
      this.$copyText(
-        `${this.$t('trials:researchRecord:message:researchFormLink')}: ${
+        `${this.$t('trials:researchRecord:message:researchFormLink')}: ${this.shareLink
          this.shareLink
        }`
      )
        .then((res) => {
@ -564,6 +418,7 @@ export default {
      const trialId = this.trialId
      this.shareLink = `${location.protocol}//${location.host}/researchLogin?trialId=${trialId}&lang=${this.$i18n.locale}`
      this.share_model.visible = true
      // this.trialSiteSurveyId = this.list[0].Id
      this.$nextTick(() => {
        this.creatQrCode()
      })
@ -611,18 +466,21 @@ export default {
  padding-right: 20px;
  width: 50%;
  position: relative;
  .shareLinkBtn {
    position: absolute;
    bottom: 0px;
    left: 0px;
  }
 }
 .shareCode {
  width: 50%;
  border-left: 1px solid #eee;
  display: flex;
  justify-content: center;
  flex-wrap: wrap;
  .qrCode {
    width: 220px;
    height: 220px;
@ -633,6 +491,7 @@ export default {
    align-items: center;
    justify-content: center;
  }
  .codeBtnBox {
    margin-top: 20px;
    width: 100%;
--- a/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
+++ b/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
@ -21,7 +21,7 @@
          <template slot-scope="scope">
            <el-button type="text" @click="
              go(
-                `/trialsResume?doctorId=${scope.row.DoctorId}&token=${token}`
+                `/trialsResume?doctorId=${scope.row.DoctorId}&token=${token}&trialId=${$route.query.trialId}`
              )
              ">{{ scope.row.LastName }} / {{ scope.row.FirstName }}</el-button>
          </template>
--- a/src/views/trials/trials-panel/reading/dicoms/components/AdditionalAssessment.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/AdditionalAssessment.vue
@ -1,10 +1,5 @@
 <template>
-  <el-form
+  <el-form v-if="isRender" ref="assessmentForm" :model="form" size="small">
    v-if="isRender"
    ref="assessmentForm"
    :model="form"
    size="small"
  >
    <div class="base-dialog-body">
      <!-- <div v-for="qs in questions" :key="qs.Id">
        <h4 v-if="qs.Type === 'group'">{{ qs.GroupName }}</h4>
@ -42,14 +37,9 @@
          </el-select>
        </el-form-item>
      </div> -->
-      <AssessmentFormItem
+      <AssessmentFormItem v-for="question of questions" :key="question.Id" :question="question" :question-form="form"
-        v-for="question of questions"
+        :readingTaskState="readingTaskState" @setFormItemData="setFormItemData"
-        :key="question.Id"
+        @resetFormItemData="resetFormItemData" />
        :question="question"
        :question-form="form"
        @setFormItemData="setFormItemData"
        @resetFormItemData="resetFormItemData"
      />
    </div>
    <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
@ -57,11 +47,7 @@
        <el-button size="small" @click="handleCancel">
          {{ $t('common:button:cancel') }}
        </el-button>
-        <el-button
+        <el-button size="small" type="primary" v-if="readingTaskState < 2" @click="handleSave">
          size="small"
          type="primary"
          @click="handleSave"
        >
          {{ $t('common:button:save') }}
        </el-button>
      </el-form-item>
@ -85,6 +71,14 @@ export default {
      default() {
        return []
      }
    },
    readingTaskState: {
      type: Number,
      default: 0
    },
    additionalAssessmentsType: {
      type: String,
      default: 'edit'
    }
  },
  data() {
@ -126,7 +120,7 @@ export default {
        }
        const res = await submitTaskAdditionalQuestion(params)
        if (res.IsSuccess) {
-          this.$emit('sign')
+          this.$emit('sign', this.additionalAssessmentsType)
        }
        loading.close()
      } catch (e) {
--- a/src/views/trials/trials-panel/reading/dicoms/components/AssessmentFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/AssessmentFormItem.vue
@ -1,67 +1,39 @@
 <template>
  <div>
-    <div
+    <div v-if="!!question.GroupName && question.Type === 'group'">
      v-if="!!question.GroupName && question.Type==='group'"
    >
      <h4 style="color: #ddd;padding: 5px 0px;margin: 0;font-size: 15px;">
-        {{ language==='en'?question.GroupEnName:question.GroupName }}
+        {{ language === 'en' ? question.GroupEnName : question.GroupName }}
      </h4>
    </div>
    <template v-else>
-      <el-form-item
+      <el-form-item :label="`${language === 'en' ? question.QuestionEnName : question.QuestionName}`"
-        :label="`${language==='en'?question.QuestionEnName:question.QuestionName}`"
+        :prop="question.Id" :rules="[
-        :prop="question.Id"
+          {
-        :rules="[
+            required: true,
-          { required: true,
+            message: $t('common:ruleMessage:select'), trigger: ['blur', 'change']
-            message: $t('common:ruleMessage:select'), trigger: ['blur', 'change']},
+          },
-        ]"
+        ]" :class="[question.Type === 'group' ? 'mb' : '']">
        :class="[question.Type==='group'?'mb':'']"
      >
        <!-- 下拉框 -->
-        <el-select
+        <el-select v-if="question.Type === 'select'" v-model="questionForm[question.Id]" clearable
-          v-if="question.Type==='select'"
+          @change="((val) => { formItemChange(val, question) })" :disabled="readingTaskState >= 2">
          v-model="questionForm[question.Id]"
          clearable
          @change="((val)=>{formItemChange(val, question)})"
        >
          <template v-if="question.DictionaryCode">
-            <el-option
+            <el-option v-for="item of $d[question.DictionaryCode]" :key="item.id" :value="String(item.value)"
-              v-for="item of $d[question.DictionaryCode]"
+              :label="item.label" />
              :key="item.id"
              :value="String(item.value)"
              :label="item.label"
            />
          </template>
          <template v-else>
-            <el-option
+            <el-option v-for="val in question.TypeValue.split('|')" :key="val" :label="val" :value="val" />
              v-for="val in question.TypeValue.split('|')"
              :key="val"
              :label="val"
              :value="val"
            />
          </template>
        </el-select>
        <!-- 单选 -->
-        <el-radio-group
+        <el-radio-group v-if="question.Type === 'radio'" v-model="questionForm[question.Id]"
-          v-if="question.Type==='radio'"
+          @change="((val) => { formItemChange(val, question) })" :disabled="readingTaskState >= 2">
          v-model="questionForm[question.Id]"
          @change="((val)=>{formItemChange(val, question)})"
        >
          <template v-if="question.DictionaryCode">
-            <el-radio
+            <el-radio v-for="item of $d[question.DictionaryCode]" :key="item.id" :label="String(item.value)">
              v-for="item of $d[question.DictionaryCode]"
              :key="item.id"
              :label="String(item.value)"
            >
              {{ item.label }}
            </el-radio>
          </template>
          <template v-else-if="question.TypeValue">
-            <el-radio
+            <el-radio v-for="val in question.TypeValue.split('|')" :key="val" :label="val">
              v-for="val in question.TypeValue.split('|')"
              :key="val"
              :label="val"
            >
              {{ val }}
            </el-radio>
          </template>
@ -69,14 +41,9 @@
      </el-form-item>
    </template>
-    <AssessmentFormItem
+    <AssessmentFormItem v-for="(item) in question.Childrens" :key="item.Id" :question="item"
-      v-for="(item) in question.Childrens"
+      :readingTaskState="readingTaskState" :question-form="questionForm" @setFormItemData="setFormItemData"
-      :key="item.Id"
+      @resetFormItemData="resetFormItemData" />
      :question="item"
      :question-form="questionForm"
      @setFormItemData="setFormItemData"
      @resetFormItemData="resetFormItemData"
    />
  </div>
 </template>
 <script>
@ -95,6 +62,10 @@ export default {
      default() {
        return []
      }
    },
    readingTaskState: {
      type: Number,
      default: 0
    }
  },
  data() {
@ -139,7 +110,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.mb{
+.mb {
  margin-bottom: 0px;
 }
 </style>
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
@ -1194,7 +1194,7 @@ export default {
            cornerstoneTools.addToolForElement(element, cornerstoneTools.WwwcRegionTool)
          }
          if (!cornerstoneTools.getToolForElement(element, cornerstoneTools.StackScrollMouseWheelTool)) {
-            cornerstoneTools.addToolForElement(element, cornerstoneTools.StackScrollMouseWheelTool)
+            cornerstoneTools.addToolForElement(element, cornerstoneTools.StackScrollMouseWheelTool, { configuration: { loop: true, } })
          }
          cornerstoneTools.setToolActiveForElement(element, 'StackScrollMouseWheel', {})
@ -1307,6 +1307,9 @@ export default {
        this.isFirstLoadIns = false
        // this.initWwc()
        this.imageId = instanceId
        if (this.isInitWwwc) {
          this.resetWwwc()
        }
      }
      this.stack.instanceId = instanceId
@ -1326,9 +1329,6 @@ export default {
        this.scrollSyncInfo.offset = 0
      }
      this.renderMeasuredData(e)
      if (this.isInitWwwc) {
        this.resetWwwc()
      }
    },
    getOrientationMarker(element) {
      const enabledElement = cornerstone.getEnabledElement(element)
@ -1708,7 +1708,7 @@ export default {
    resetWwwc() {
      // console.log('resetWwwc')
      this.isInitWwwc = true
-      this.toolState.viewportInvert = false
+      // this.toolState.viewportInvert = false
      var viewport = cornerstone.getViewport(this.canvas)
      // viewport.invert = false
      var image = cornerstone.getImage(this.canvas)
@ -1839,6 +1839,9 @@ export default {
      //   console.log(toolName)
      //   cornerstoneTools.setToolPassiveForElement(this.canvas, toolName)
      // })
      if (toolName === 'Wwwc') {
        this.isInitWwwc = false
      }
      this.activeToolName = toolName
      this.$nextTick(() => {
        // console.log(cornerstoneTools.isToolActiveForElement(this.canvas, 'Bidirectional'))
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
@ -214,56 +214,25 @@
      <!--  @dblclick.native="reloadViewport('CT_AXIAL')" -->
      <div ref="dicomContainer" class="dicom-container box box_2_2" style="position: relative;"
        @dblclick="reloadViewport">
-        <Viewport 
+        <Viewport ref="CT_AXIAL" :index="1" :active-index="activeIndex"
-          ref="CT_AXIAL" 
+          :is-reading-show-subject-info="isReadingShowSubjectInfo" :series-info="ctSeries"
-          :index="1" 
+          :rendering-engine-id="renderingEngineId" viewport-id="CT_AXIAL" :volume="ctVolume"
-          :active-index="activeIndex"
+          :measure-datas="measureDatas" :style="1 === activeIndex ? viewportStyle : {}"
-          :is-reading-show-subject-info="isReadingShowSubjectInfo" 
+          @upperRangeChange="upperRangeChange" />
-          :series-info="ctSeries"
+        <Viewport ref="PT_AXIAL" :index="2" :active-index="activeIndex"
-          :rendering-engine-id="renderingEngineId" 
+          :is-reading-show-subject-info="isReadingShowSubjectInfo" :series-info="petSeries"
-          viewport-id="CT_AXIAL" :volume="ctVolume"
+          :rendering-engine-id="renderingEngineId" viewport-id="PT_AXIAL" :volume="ptVolume"
-          :measure-datas="measureDatas" 
+          :measure-datas="measureDatas" :style="2 === activeIndex ? viewportStyle : {}"
-          :style="1 === activeIndex ? viewportStyle : {}" 
+          @upperRangeChange="upperRangeChange" />
-          @upperRangeChange="upperRangeChange"
+        <Viewport ref="FUSION_AXIAL" :index="3" :active-index="activeIndex"
-        />
+          :is-reading-show-subject-info="isReadingShowSubjectInfo" :series-info="petSeries"
-        <Viewport 
+          :rendering-engine-id="renderingEngineId" viewport-id="FUSION_AXIAL" :volume="ptVolume"
-          ref="PT_AXIAL" 
+          :measure-datas="measureDatas" :rgb-preset-name="rgbPresetName" :style="3 === activeIndex ? viewportStyle : {}"
-          :index="2" 
+          @upperRangeChange="upperRangeChange" />
-          :active-index="activeIndex"
+        <Viewport ref="PET_MIP_CORONAL" :index="4" :active-index="activeIndex"
-          :is-reading-show-subject-info="isReadingShowSubjectInfo" 
+          :is-reading-show-subject-info="isReadingShowSubjectInfo" :series-info="petSeries"
-          :series-info="petSeries"
+          :rendering-engine-id="renderingEngineId" viewport-id="PET_MIP_CORONAL" :measure-datas="measureDatas"
-          :rendering-engine-id="renderingEngineId" 
+          :style="4 === activeIndex ? viewportStyle : {}" @upperRangeChange="upperRangeChange" />
          viewport-id="PT_AXIAL" 
          :volume="ptVolume"
          :measure-datas="measureDatas" 
          :style="2 === activeIndex ? viewportStyle : {}" 
           @upperRangeChange="upperRangeChange"
        />
        <Viewport 
          ref="FUSION_AXIAL" 
          :index="3" 
          :active-index="activeIndex"
          :is-reading-show-subject-info="isReadingShowSubjectInfo" 
          :series-info="petSeries"
          :rendering-engine-id="renderingEngineId" 
          viewport-id="FUSION_AXIAL" 
          :volume="ptVolume"
          :measure-datas="measureDatas" 
          :rgb-preset-name="rgbPresetName"
          :style="3 === activeIndex ? viewportStyle : {}" 
           @upperRangeChange="upperRangeChange"
        />
        <Viewport 
          ref="PET_MIP_CORONAL" 
          :index="4" 
          :active-index="activeIndex"
          :is-reading-show-subject-info="isReadingShowSubjectInfo" 
          :series-info="petSeries"
          :rendering-engine-id="renderingEngineId" 
          viewport-id="PET_MIP_CORONAL" :measure-datas="measureDatas"
          :style="4 === activeIndex ? viewportStyle : {}" 
           @upperRangeChange="upperRangeChange"
        />
      </div>
      <!-- 表单 -->
      <div class="form-container" style="overflow-y: auto;">
@ -273,19 +242,22 @@
            <span style="margin-left:5px;">{{ taskBlindName }}</span>
          </h3>
-          <TableQuestions ref="tableQuestions" />
+          <TableQuestions ref="tableQuestions" @handleReadingChart="handleReadingChart" />
-          <Questions ref="questions" @setNonTargetMeasurementStatus="setNonTargetMeasurementStatus" />
+          <Questions ref="questions" @setNonTargetMeasurementStatus="setNonTargetMeasurementStatus"
            @handleReadingChart="handleReadingChart" />
        </div>
      </div>
    </div>
    <el-dialog v-if="customWwc.visible" :visible.sync="customWwc.visible" :close-on-click-modal="false"
      :title="customWwc.title" width="400px" custom-class="base-dialog-wrapper">
-      <custom-wwwc-form :ww="activeCanvasWW" :wc="activeCanvasWC" @close="customWwc.visible = false" @setWwwc="setWwwc" />
+      <custom-wwwc-form :ww="activeCanvasWW" :wc="activeCanvasWC" @close="customWwc.visible = false"
        @setWwwc="setWwwc" />
    </el-dialog>
    <el-dialog :visible.sync="fusion.visible" :close-on-click-modal="false" :title="$t('trials:lugano:button:record')"
      width="850px">
      <fusion-form @close="fusion.visible = false" />
    </el-dialog>
    <readingChart ref="readingChart" />
  </div>
 </template>
 <script>
@ -333,6 +305,7 @@ import vtkPiecewiseFunction from '@kitware/vtk.js/Common/DataModel/PiecewiseFunc
 // import vtkOrientationMarkerWidget from '@kitware/vtk.js/Interaction/Widgets/OrientationMarkerWidget'
 import { mat4, vec3 } from 'gl-matrix'
 import html2canvas from 'html2canvas'
 import readingChart from '@/components/readingChart'
 // import vtkColorTransferFunction from '@kitware/vtk.js/Rendering/Core/ColorTransferFunction'
 // import vtkMath from '@kitware/vtk.js/Common/Core/Math'
 // import CircleROITool from './tools/CircleROITool'
@ -378,6 +351,7 @@ const ctVolumeName = 'CT_VOLUME_ID' // Id of the volume less loader prefix
 const ctVolumeId = `${volumeLoaderScheme}:${ctVolumeName}` // VolumeId with loader id + volume id
 const ptVolumeName = 'PT_VOLUME_ID'
 const ptVolumeId = `${volumeLoaderScheme}:${ptVolumeName}`
 const ptVolumeId2 = `${volumeLoaderScheme}:${ptVolumeName}2`
 const ctToolGroupId = 'CT_TOOLGROUP_ID'
 const ptToolGroupId = 'PT_TOOLGROUP_ID'
 const fusionToolGroupId = 'FUSION_TOOLGROUP_ID'
@ -420,7 +394,8 @@ export default {
    Questions,
    TableQuestions,
    CustomWwwcForm,
-    FusionForm
+    FusionForm,
    readingChart
  },
  data() {
    return {
@ -442,8 +417,10 @@ export default {
      renderingEngineId: renderingEngineId,
      ctVolumeId: `${volumeLoaderScheme}:${ctVolumeName}`,
      ptVolumeId: `${volumeLoaderScheme}:${ptVolumeName}`,
      ptVolumeId2: `${volumeLoaderScheme}:${ptVolumeName}2`,
      ctVolume: null,
      ptVolume: null,
      ptVolume2: null,
      isReadingShowSubjectInfo: false,
      subjectCode: '',
      taskBlindName: '',
@ -582,6 +559,7 @@ export default {
      this.screenshotWindow = window.open(routeData.href, '_blank')
    })
    window.addEventListener('beforeunload', e => { this.beforeUnloadHandler(e) })
    document.addEventListener("click", this.foo);
  },
  beforeDestroy() {
    if (this.screenshotWindow) {
@ -604,7 +582,21 @@ export default {
    window.removeEventListener('beforeunload', e => { this.beforeUnloadHandler(e) })
  },
  methods: {
-
+    handleReadingChart(row) {
      let { e, data } = row
      let obj = Object.assign({}, data)
      obj.TrialId = this.$route.query.trialId
      obj.VisitTaskId = this.$route.query.visitTaskId
      let zIndex = 9
      if (obj.RowIndex) {
        zIndex = 9999
      }
      this.$refs.readingChart.init(e, obj, zIndex)
    },
    foo() {
      if (!this.$refs.readingChart) return false
      this.$refs.readingChart.foo()
    },
    initPage() {
      const resizeObserver = new ResizeObserver(() => {
        if (element_ct.style.width) {
@ -999,6 +991,9 @@ export default {
        this.ptVolume = await volumeLoader.createAndCacheVolume(ptVolumeId, {
          imageIds: ptImageIds
        })
        this.ptVolume2 = await volumeLoader.createAndCacheVolume(ptVolumeId2, {
          imageIds: ptImageIds
        })
        // 重置计时器
        this.resetTimer()
      } catch (error) {
@ -1505,6 +1500,10 @@ export default {
      await setVolumesForViewports(
        renderingEngine,
        [
          {
            volumeId: ptVolumeId2,
            callback: setPetColorMapTransferFunctionForVolumeActor
          },
          {
            volumeId: ctVolumeId,
            callback: setCtTransferFunctionForVolumeActor
@ -1715,7 +1714,7 @@ export default {
    },
    voiChange(v) {
      let viewportIds = ['FUSION_AXIAL', 'PT_AXIAL', 'PET_MIP_CORONAL']
-      viewportIds.map(viewportId=>{
+      viewportIds.map(viewportId => {
        // const volumeId = viewportId === 'viewportId' ? ptVolumeId : ctVolumeId
        const volumeId = ptVolumeId
        const voiRange = { lower: 0, upper: v }
@ -1743,7 +1742,7 @@ export default {
    async setColorMap(rgbPresetName) {
      this.rgbPresetName = rgbPresetName
      let viewports = ['FUSION_AXIAL', 'PT_AXIAL', 'PET_MIP_CORONAL']
-      viewports.map(v=>{
+      viewports.map(v => {
        this.$refs[v].setPreset(this.rgbPresetName)
        this.$refs[v].renderColorBar(this.rgbPresetName)
        this.createColorBar(this.rgbPresetName, 'colorBarCanvas', 256, 15)
@ -1862,8 +1861,8 @@ export default {
      const renderingEngine = getRenderingEngine(renderingEngineId)
      const viewport = renderingEngine.getViewport(viewporId)
      const { invert } = viewport.getProperties()
-      if ( this.isFusion ) {
+      if (this.isFusion) {
-        viewport.setProperties({ invert: !invert }, volumeId )
+        viewport.setProperties({ invert: !invert }, volumeId)
      }
      viewport.setProperties({ invert: !invert })
      viewport.render()
@ -1987,7 +1986,7 @@ export default {
      const viewport = renderingEngine.getViewport(viewportId)
      const lower = v.wc - v.ww / 2
      const upper = v.wc + v.ww / 2 - 1
-      viewport.setProperties({ voiRange: { upper: upper, lower: lower }})
+      viewport.setProperties({ voiRange: { upper: upper, lower: lower } })
      viewport.render()
      this.customWwc.visible = false
    },
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue
@ -1,305 +1,219 @@
 <template>
  <div>
-    <div
+    <div v-if="!!question.GroupName && question.Type === 'group'">
      v-if="!!question.GroupName && question.Type==='group'"
    >
      <h4 style="color: #ddd;padding: 5px 0px;margin: 0;">
-        {{ language==='en'?question.GroupEnName:question.GroupName }}
+        {{ language === 'en' ? question.GroupEnName : question.GroupName }}
      </h4>
    </div>
    <template v-else-if="((question.QuestionType === 56) && question.IsBaseLineTask)" />
    <template v-else>
      <el-form-item
-        v-if="(question.ShowQuestion===1 && question.ParentTriggerValueList.includes(String(questionForm[question.ParentId]))) || question.ShowQuestion===0"
+        v-if="(question.ShowQuestion === 1 && question.ParentTriggerValueList.includes(String(questionForm[question.ParentId]))) || question.ShowQuestion === 0"
-        :label="`${question.QuestionName}`"
+        :label="`${question.QuestionName}`" :prop="question.Id" :rules="[
-        :prop="question.Id"
+          {
-        :rules="[
+            required: (question.IsRequired === 0 || (question.IsRequired === 1 && question.RelevanceId && (questionForm[question.RelevanceId] === question.RelevanceValue))) && question.Type !== 'group' && question.Type !== 'summary',
-          { required: (question.IsRequired === 0 || (question.IsRequired ===1 && question.RelevanceId && (questionForm[question.RelevanceId] === question.RelevanceValue))) && question.Type!=='group' && question.Type!=='summary',
+            message: ['radio', 'select', 'checkbox'].includes(question.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur', 'change']
-            message: ['radio', 'select', 'checkbox'].includes(question.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur', 'change']},
+          },
-        ]"
+        ]" :class="[question.Type === 'group' ? 'mb' : question.Type === 'upload' ? 'uploadWrapper' : '']">
        :class="[question.Type==='group'?'mb':question.Type==='upload'?'uploadWrapper':'']"
      >
        <template v-if="question.QuestionType === 51 || question.QuestionType === 52">
          <!-- question.QuestionType === 51 || question.QuestionType === 52 -->
          <div style="display: flex;flex-direction: row;justify-content: flex-start;">
-            <el-input
+            <div style="display: flex;justify-content: space-between;" v-if="question.Type === 'calculation'">
-              v-if="question.Type==='calculation'"
+              <el-input v-model="questionForm[question.Id]" disabled style="width: 120px;">
-              v-model="questionForm[question.Id]"
+                <template v-if="question.Unit" slot="append">
-              disabled
+                  {{ $fd('ValueUnit', parseInt(question.Unit)) }}
-              style="width: 120px;"
+                </template>
-            >
+                <svg-icon v-if="question.ShowChartTypeEnum > 0" icon-class="readingChart"
-              <template v-if="question.Unit" slot="append">
+                  class="svg-icon svg-readingChart" @click.stop="(e) => handleReadingChart({
-                {{ $fd('ValueUnit', parseInt(question.Unit)) }}
+                    e,
-              </template>
+                    data: {
-            </el-input>
+                      QuestionId: question.Id,
                      RowIndex: questionForm.RowIndex,
                      QuestionName: question.QuestionName
                    }
                  })" />
              </el-input>
            </div>
            <!-- 测量 -->
-            <el-button v-if="(!questionForm[question.Id] && ((question.QuestionType === 51 && liverIsInsideVolume) || (question.QuestionType === 52 && lungIsInsideVolume)) && readingTaskState!== 2)" size="mini" type="text" @click="addAnnotation(question)">{{ $t('trials:lugano:button:addAnnotation') }}</el-button>
+            <el-button
              v-if="(!questionForm[question.Id] && ((question.QuestionType === 51 && liverIsInsideVolume) || (question.QuestionType === 52 && lungIsInsideVolume)) && readingTaskState !== 2)"
              size="mini" type="text" @click="addAnnotation(question)">{{ $t('trials:lugano:button:addAnnotation')
              }}</el-button>
            <!-- 清除标记 -->
-            <el-button v-if="(questionForm[question.Id] || (question.QuestionType === 51 && !liverIsInsideVolume) || (question.QuestionType === 52 && !lungIsInsideVolume)) && readingTaskState!== 2" size="mini" type="text" style="padding: 7px 5px;margin-left:5px;" @click="removeAnnotation(question)">{{ $t('trials:lugano:button:clearAnnotation') }}</el-button>
+            <el-button
              v-if="(questionForm[question.Id] || (question.QuestionType === 51 && !liverIsInsideVolume) || (question.QuestionType === 52 && !lungIsInsideVolume)) && readingTaskState !== 2"
              size="mini" type="text" style="padding: 7px 5px;margin-left:5px;" @click="removeAnnotation(question)">{{
                $t('trials:lugano:button:clearAnnotation') }}</el-button>
            <!-- 定位 -->
            <el-button
              v-if="(questionForm[question.Id] || (question.QuestionType === 51 && !liverIsInsideVolume) || (question.QuestionType === 52 && !lungIsInsideVolume))"
-              size="mini"
+              size="mini" type="text" style="padding: '7px 5px';margin-left:-5px;"
-              type="text"
+              @click="locateAnnotation(question)">{{
-              style="padding: '7px 5px';margin-left:-5px;"
+                $t('trials:lugano:button:locateAnnotation') }}</el-button>
              @click="locateAnnotation(question)"
            >{{ $t('trials:lugano:button:locateAnnotation') }}</el-button>
            <!-- 保存 -->
-            <el-button v-if="readingTaskState!== 2 && question.SaveEnum === 1" size="mini" type="text" style="padding: '7px 5px';margin-left:-5px;" @click="saveAnnotation(question)">
+            <el-button v-if="readingTaskState !== 2 && question.SaveEnum === 1" size="mini" type="text"
              style="padding: '7px 5px';margin-left:-5px;" @click="saveAnnotation(question)">
              <!-- 未保存 -->
              <el-tooltip class="item" effect="dark" :content="$t('trials:reading:button:unsaved')" placement="bottom">
                <i class="el-icon-warning" style="color:red" />
              </el-tooltip>
              {{ $t('common:button:save') }}
            </el-button>
-            <el-button v-if="!question.IsBaseLineTask" size="mini" type="text" style="padding: '7px 5px';margin-left:-5px;" @click="viewAnnotations(question)">{{ $t('trials:lugano:button:suvscreenshot') }}</el-button>
+            <el-button v-if="!question.IsBaseLineTask" size="mini" type="text"
              style="padding: '7px 5px';margin-left:-5px;" @click="viewAnnotations(question)">{{
                $t('trials:lugano:button:suvscreenshot') }}</el-button>
          </div>
        </template>
        <template v-else-if="question.QuestionType === 53">
-          <el-input
+          <div style="display: flex;justify-content: space-between;" v-if="question.Type === 'calculation'">
-            v-if="question.Type==='calculation'"
+            <el-input v-model="questionForm[question.Id]" disabled>
-            v-model="questionForm[question.Id]"
+              <template v-if="question.Unit" slot="append">
-            disabled
+                {{ $fd('ValueUnit', parseInt(question.Unit)) }}
-          >
+              </template>
-            <template v-if="question.Unit" slot="append">
+            </el-input>
-              {{ $fd('ValueUnit', parseInt(question.Unit)) }}
+            <svg-icon v-if="question.ShowChartTypeEnum > 0" icon-class="readingChart" class="svg-icon svg-readingChart"
-            </template>
+              @click.stop="(e) => handleReadingChart({
-          </el-input>
+                e,
                data: {
                  QuestionId: question.Id,
                  RowIndex: questionForm.RowIndex,
                  QuestionName: question.QuestionName
                }
              })" />
          </div>
        </template>
        <template v-else-if="question.QuestionType === 55">
-          <el-select
+          <el-select v-model="questionForm[question.Id]" :disabled="readingTaskState >= 2" clearable
-            v-model="questionForm[question.Id]"
+            @change="((val) => { formItemChange(val, question) })">
            :disabled="readingTaskState >= 2 "
            clearable
            @change="((val)=>{formItemChange(val, question)})"
          >
            <el-option-group
-              :label="!isNaN(parseFloat(question.LastTaskAnswer)) ? `${$t('trials:dicomReading:tip:lastVisitStatus')} ${$fd(question.DictionaryCode,parseFloat(question.LastTaskAnswer))}` : ''"
+              :label="!isNaN(parseFloat(question.LastTaskAnswer)) ? `${$t('trials:dicomReading:tip:lastVisitStatus')} ${$fd(question.DictionaryCode, parseFloat(question.LastTaskAnswer))}` : ''">
            >
              <template>
-                <el-option
+                <el-option v-for="item of $d[question.DictionaryCode]" :key="item.id" :value="String(item.value)"
-                  v-for="item of $d[question.DictionaryCode]"
+                  :label="item.label" />
                  :key="item.id"
                  :value="String(item.value)"
                  :label="item.label"
                />
              </template>
            </el-option-group>
          </el-select>
        </template>
        <template v-else-if="question.QuestionType === 56">
-          <el-select
+          <el-select v-model="questionForm[question.Id]" :disabled="readingTaskState >= 2" clearable
-            v-model="questionForm[question.Id]"
+            @change="((val) => { formItemChange(val, question) })">
            :disabled="readingTaskState >= 2 "
            clearable
            @change="((val)=>{formItemChange(val, question)})"
          >
            <el-option-group
-              :label="!isNaN(parseFloat(question.LastTaskAnswer)) ? `${$t('trials:dicomReading:tip:lastVisitStatus')} ${parseFloat(question.LastTaskAnswer) === 5 ? 'NA' : $fd(question.DictionaryCode,parseFloat(question.LastTaskAnswer))}` : ''"
+              :label="!isNaN(parseFloat(question.LastTaskAnswer)) ? `${$t('trials:dicomReading:tip:lastVisitStatus')} ${parseFloat(question.LastTaskAnswer) === 5 ? 'NA' : $fd(question.DictionaryCode, parseFloat(question.LastTaskAnswer))}` : ''">
-            >
+              <template v-if="pet5PS * 1 === -1">
-              <template v-if="pet5PS*1=== -1">
+                <el-option v-for="item of $d[question.DictionaryCode]" v-show="item.value !== 4" :key="item.id"
-                <el-option
+                  :value="String(item.value)" :label="item.label" />
                  v-for="item of $d[question.DictionaryCode]"
                  v-show="item.value !== 4"
                  :key="item.id"
                  :value="String(item.value)"
                  :label="item.label"
                />
              </template>
              <template v-else>
-                <el-option
+                <el-option v-for="item of $d[question.DictionaryCode]" :key="item.id" :value="String(item.value)"
-                  v-for="item of $d[question.DictionaryCode]"
+                  :label="item.label" />
                  :key="item.id"
                  :value="String(item.value)"
                  :label="item.label"
                />
              </template>
            </el-option-group>
          </el-select>
        </template>
        <template v-else-if="question.QuestionType === 57">
-          <el-select
+          <el-select v-model="questionForm[question.Id]" :disabled="readingTaskState >= 2" clearable
-            v-model="questionForm[question.Id]"
+            @change="((val) => { formItemChange(val, question) })">
            :disabled="readingTaskState >= 2 "
            clearable
            @change="((val)=>{formItemChange(val, question)})"
          >
            <el-option-group
-              :label="!isNaN(parseFloat(question.LastTaskAnswer)) ? `${$t('trials:dicomReading:tip:lastVisitStatus')} ${$fd(question.DictionaryCode,parseFloat(question.LastTaskAnswer))}` : ''"
+              :label="!isNaN(parseFloat(question.LastTaskAnswer)) ? `${$t('trials:dicomReading:tip:lastVisitStatus')} ${$fd(question.DictionaryCode, parseFloat(question.LastTaskAnswer))}` : ''">
-            >
+              <template v-if="pet5PS * 1 === -1">
-              <template v-if="pet5PS*1=== -1">
+                <el-option v-for="item of $d[question.DictionaryCode]" v-show="item.value !== 1" :key="item.id"
-                <el-option
+                  :value="String(item.value)" :label="item.label" />
                  v-for="item of $d[question.DictionaryCode]"
                  v-show="item.value !== 1"
                  :key="item.id"
                  :value="String(item.value)"
                  :label="item.label"
                />
              </template>
              <template v-else>
-                <el-option
+                <el-option v-for="item of $d[question.DictionaryCode]" :key="item.id" :value="String(item.value)"
-                  v-for="item of $d[question.DictionaryCode]"
+                  :label="item.label" />
                  :key="item.id"
                  :value="String(item.value)"
                  :label="item.label"
                />
              </template>
            </el-option-group>
          </el-select>
        </template>
        <!-- 输入框 -->
-        <el-input
+        <el-input v-else-if="question.Type === 'input'" v-model="questionForm[question.Id]"
-          v-else-if="question.Type==='input'"
+          :disabled="readingTaskState >= 2" />
          v-model="questionForm[question.Id]"
          :disabled="readingTaskState >= 2"
        />
        <!-- 多行文本输入框 -->
-        <el-input
+        <el-input v-else-if="question.Type === 'textarea'" v-model="questionForm[question.Id]" type="textarea"
-          v-else-if="question.Type==='textarea'"
+          :autosize="{ minRows: 2, maxRows: 4 }" maxlength="500" :disabled="readingTaskState >= 2" />
          v-model="questionForm[question.Id]"
          type="textarea"
          :autosize="{ minRows: 2, maxRows: 4}"
          maxlength="500"
          :disabled="readingTaskState >= 2"
        />
        <!-- 下拉框 -->
-        <el-select
+        <el-select v-else-if="question.Type === 'select'" v-model="questionForm[question.Id]"
          v-else-if="question.Type==='select'"
          v-model="questionForm[question.Id]"
          :disabled="readingTaskState >= 2 || ((question.TableQuestionType === 2 || question.QuestionGenre === 2) && !!question.DictionaryCode) || question.QuestionType === 50"
-          clearable
+          clearable @change="((val) => { formItemChange(val, question) })">
          @change="((val)=>{formItemChange(val, question)})"
        >
          <template v-if="question.TableQuestionType === 1">
-            <el-option
+            <el-option v-for="item in organList" :key="item.Id" :label="item[question.DataTableColumn]"
-              v-for="item in organList"
+              :value="item[question.DataTableColumn]" />
              :key="item.Id"
              :label="item[question.DataTableColumn]"
              :value="item[question.DataTableColumn]"
            />
          </template>
          <template v-else-if="question.TableQuestionType === 3 || question.QuestionGenre === 3">
-            <el-option
+            <el-option v-for="item of $d[question.DictionaryCode]" :key="item.id" :value="String(item.value)"
-              v-for="item of $d[question.DictionaryCode]"
+              :label="item.label" />
              :key="item.id"
              :value="String(item.value)"
              :label="item.label"
            />
          </template>
-          <template v-else-if="(question.TableQuestionType === 2 || question.QuestionGenre === 2) && question.DictionaryCode">
+          <template
-            <el-option
+            v-else-if="(question.TableQuestionType === 2 || question.QuestionGenre === 2) && question.DictionaryCode">
-              v-for="item of $d[question.DictionaryCode]"
+            <el-option v-for="item of $d[question.DictionaryCode]" :key="item.id" :value="String(item.value)"
-              :key="item.id"
+              :label="item.label" />
              :value="String(item.value)"
              :label="item.label"
            />
          </template>
          <template v-else>
-            <el-option
+            <el-option v-for="val in question.TypeValue.split('|')" :key="val" :label="val" :value="val" />
              v-for="val in question.TypeValue.split('|')"
              :key="val"
              :label="val"
              :value="val"
            />
          </template>
        </el-select>
        <!-- 单选 -->
-        <el-radio-group
+        <el-radio-group v-else-if="question.Type === 'radio'" v-model="questionForm[question.Id]"
-          v-else-if="question.Type==='radio'"
+          :disabled="readingTaskState >= 2" @change="((val) => { formItemChange(val, question) })">
          v-model="questionForm[question.Id]"
          :disabled="readingTaskState >= 2"
          @change="((val)=>{formItemChange(val, question)})"
        >
          <template v-if="question.DictionaryCode">
-            <el-radio
+            <el-radio v-for="item of $d[question.DictionaryCode]" :key="item.id" :label="String(item.value)">
              v-for="item of $d[question.DictionaryCode]"
              :key="item.id"
              :label="String(item.value)"
            >
              {{ item.label }}
            </el-radio>
          </template>
          <template v-else-if="question.TypeValue">
-            <el-radio
+            <el-radio v-for="val in question.TypeValue.split('|')" :key="val" :label="val">
              v-for="val in question.TypeValue.split('|')"
              :key="val"
              :label="val"
            >
              {{ val }}
            </el-radio>
          </template>
        </el-radio-group>
        <!-- 复选框 -->
-        <el-checkbox-group
+        <el-checkbox-group v-else-if="question.Type === 'checkbox'" v-model="questionForm[question.Id]"
-          v-else-if="question.Type==='checkbox'"
+          :disabled="readingTaskState >= 2">
-          v-model="questionForm[question.Id]"
+          <el-checkbox v-for="val in question.TypeValue.split('|')" :key="val" :label="val">
          :disabled="readingTaskState >= 2"
        >
          <el-checkbox
            v-for="val in question.TypeValue.split('|')"
            :key="val"
            :label="val"
          >
            {{ val }}
          </el-checkbox>
        </el-checkbox-group>
        <!-- 数值 -->
-        <el-input-number
+
-          v-else-if="question.Type==='number'"
+        <div style="display: flex;justify-content: space-between;"
-          v-model="questionForm[question.Id]"
+          v-else-if="question.Type === 'calculation' || question.Type === 'number'">
-          :disabled="readingTaskState >= 2"
+          <el-input-number v-if="question.Type === 'number'" v-model="questionForm[question.Id]"
-        />
+            :disabled="readingTaskState >= 2" />
-        <el-input
+          <el-input v-model="questionForm[question.Id]" disabled v-else />
-          v-else-if="question.Type==='calculation'"
+          <svg-icon v-if="question.ShowChartTypeEnum > 0" icon-class="readingChart" class="svg-icon svg-readingChart"
-          v-model="questionForm[question.Id]"
+            @click.stop="(e) => handleReadingChart({
-          disabled
+              e,
-        />
+              data: {
                QuestionId: question.Id,
                RowIndex: questionForm.RowIndex,
                QuestionName: question.QuestionName
              }
            })" />
        </div>
        <!-- 上传图像 -->
-        <el-upload
+        <el-upload v-if="question.Type === 'upload'" action :accept="accept" :limit="question.ImageCount"
-          v-if="question.Type==='upload'"
+          :on-preview="handlePictureCardPreview" :before-upload="handleBeforeUpload" :http-request="uploadScreenshot"
-          action
+          list-type="picture-card" :on-remove="handleRemove" :file-list="fileList"
-          :accept="accept"
+          :class="{ disabled: fileList.length >= question.ImageCount }" :disabled="readingTaskState >= 2">
          :limit="question.ImageCount"
          :on-preview="handlePictureCardPreview"
          :before-upload="handleBeforeUpload"
          :http-request="uploadScreenshot"
          list-type="picture-card"
          :on-remove="handleRemove"
          :file-list="fileList"
          :class="{disabled:fileList.length >= question.ImageCount}"
          :disabled="readingTaskState >= 2"
        >
          <i slot="default" class="el-icon-plus" />
          <div slot="file" slot-scope="{file}">
-            <img
+            <img class="el-upload-list__item-thumbnail" :src="OSSclientConfig.basePath + file.url" alt="">
              class="el-upload-list__item-thumbnail"
              :src="OSSclientConfig.basePath + file.url"
              alt=""
            >
            <span class="el-upload-list__item-actions">
-              <span
+              <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
                class="el-upload-list__item-preview"
                @click="handlePictureCardPreview(file)"
              >
                <i class="el-icon-zoom-in" />
              </span>
-              <span
+              <span v-if="readingTaskState < 2" class="el-upload-list__item-delete" @click="handleRemove(file)">
                v-if="readingTaskState < 2"
                class="el-upload-list__item-delete"
                @click="handleRemove(file)"
              >
                <i class="el-icon-delete" />
              </span>
            </span>
          </div>
        </el-upload>
-        <el-dialog
+        <el-dialog v-if="question.Type === 'upload'" append-to-body :visible.sync="imgVisible" width="600px">
          v-if="question.Type==='upload'"
          append-to-body
          :visible.sync="imgVisible"
          width="600px"
        >
          <el-image :src="imageUrl" width="100%">
            <div slot="placeholder" class="image-slot">
              加载中<span class="dot">...</span>
@ -309,19 +223,11 @@
      </el-form-item>
    </template>
    <template v-for="item of question.Childrens">
-      <QuestionItem
+      <QuestionItem v-if="item.QuestionClassify === 0" :key="item.Id" :question="item"
-        v-if="item.QuestionClassify === 0"
+        :reading-task-state="readingTaskState" :question-form="questionForm" :visit-task-id="visitTaskId"
-        :key="item.Id"
+        :pet5p-s="pet5PS" :lung-is-inside-volume="lungIsInsideVolume" :liver-is-inside-volume="liverIsInsideVolume"
-        :question="item"
+        @setFormItemData="setFormItemData" @resetFormItemData="resetFormItemData"
-        :reading-task-state="readingTaskState"
+        @handleReadingChart="handleReadingChart" />
        :question-form="questionForm"
        :visit-task-id="visitTaskId"
        :pet5p-s="pet5PS"
        :lung-is-inside-volume="lungIsInsideVolume"
        :liver-is-inside-volume="liverIsInsideVolume"
        @setFormItemData="setFormItemData"
        @resetFormItemData="resetFormItemData"
      />
    </template>
  </div>
 </template>
@ -406,6 +312,9 @@ export default {
    }
  },
  methods: {
    handleReadingChart(e) {
      this.$emit('handleReadingChart', e)
    },
    formItemChange(v, question) {
      if (question.QuestionType === 55) {
        this.$emit('setFormItemData', { key: question.Id, val: v })
@ -441,7 +350,7 @@ export default {
        .then(() => {
          FusionEvent.$emit('removeAnnotation', question)
        })
-        .catch(() => {})
+        .catch(() => { })
    },
    locateAnnotation(question) {
      FusionEvent.$emit('locateAnnotation', question)
@ -503,26 +412,32 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.mb{
+.mb {
  margin-bottom: 0px;
 }
-.disabled{
+
 .disabled {
  ::v-deep .el-upload--picture-card {
    display: none;
  }
 }
-.uploadWrapper{
+
 .uploadWrapper {
  display: flex;
  flex-direction: column;
  align-items: flex-start;
 }
-::v-deep .el-input.is-disabled .el-input__inner{
+
-    background-color: #646464a1;
+::v-deep .el-input.is-disabled .el-input__inner {
-  }
+  background-color: #646464a1;
-  ::v-deep .el-input-group__append, .el-input-group__prepend{
+}
-    padding: 0 5px;
+
-  }
+::v-deep .el-input-group__append,
-  ::v-deep .el-select.is-disabled .el-input__inner{
+.el-input-group__prepend {
-    background-color: #646464a1;
+  padding: 0 5px;
-  }
+}
 ::v-deep .el-select.is-disabled .el-input__inner {
  background-color: #646464a1;
 }
 </style>
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
@ -1,29 +1,17 @@
 <template>
  <div v-loading="loading" class="ecrf-wrapper">
-    <el-form
+    <el-form v-if="questions.length > 0" ref="questions" size="small" :model="questionForm">
      v-if="questions.length > 0"
      ref="questions"
      size="small"
      :model="questionForm"
    >
      <template v-for="question of questions">
-        <QuestionItem
+        <QuestionItem v-if="question.QuestionClassify === 0" :key="question.Id" :question="question"
-          v-if="question.QuestionClassify === 0"
+          :question-form="questionForm" :reading-task-state="readingTaskState" :visit-task-id="visitTaskId"
-          :key="question.Id"
+          :pet5p-s="questionForm[pet5PSId]" :lung-is-inside-volume="lungIsInsideVolume"
-          :question="question"
+          :liver-is-inside-volume="liverIsInsideVolume" @setFormItemData="setFormItemData"
-          :question-form="questionForm"
+          @resetFormItemData="resetFormItemData" @handleReadingChart="handleReadingChart" />
          :reading-task-state="readingTaskState"
          :visit-task-id="visitTaskId"
          :pet5p-s="questionForm[pet5PSId]"
          :lung-is-inside-volume="lungIsInsideVolume"
          :liver-is-inside-volume="liverIsInsideVolume"
          @setFormItemData="setFormItemData"
          @resetFormItemData="resetFormItemData"
        />
      </template>
      <el-form-item v-if="readingTaskState < 2">
        <div style="text-align:right">
-          <el-button :disabled="!questionFormChangeState" :type="questionFormChangeState ? 'primary' : null" size="mini" @click="handleSave">{{ $t('common:button:save') }}</el-button>
+          <el-button :disabled="!questionFormChangeState" :type="questionFormChangeState ? 'primary' : null" size="mini"
            @click="handleSave">{{ $t('common:button:save') }}</el-button>
        </div>
      </el-form-item>
    </el-form>
@ -132,6 +120,9 @@ export default {
    FusionEvent.$off('locateAnnotation')
  },
  methods: {
    handleReadingChart(e) {
      this.$emit('handleReadingChart', e)
    },
    getQuestions1() {
      var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
@ -139,17 +130,17 @@ export default {
        this.readingTaskState = this.visitTaskList[idx].ReadingTaskState
        var questions = this.visitTaskList[idx].Questions
        this.questions =
-        questions.map((v) => {
+          questions.map((v) => {
-          if (v.QuestionClassify === 0) {
+            if (v.QuestionClassify === 0) {
-            if (v.Type === 'group' && v.Childrens.length === 0) return
+              if (v.Type === 'group' && v.Childrens.length === 0) return
-            if (!v.IsPage && v.Type !== 'group' && v.Type !== 'summary') {
+              if (!v.IsPage && v.Type !== 'group' && v.Type !== 'summary') {
-              this.$set(this.questionForm, v.Id, v.Answer ? v.Answer : null)
+                this.$set(this.questionForm, v.Id, v.Answer ? v.Answer : null)
              }
              if (v.Childrens.length > 0) {
                this.setChild(v.Childrens)
              }
            }
-            if (v.Childrens.length > 0) {
+          })
              this.setChild(v.Childrens)
            }
          }
        })
        this.questions = questions
      }
    },
@ -185,7 +176,7 @@ export default {
              this.setChild(v.Childrens)
            }
          })
-          console.log(this.questionForm,questions)
+          console.log(this.questionForm, questions)
          this.questions = questions
          this.setPet5PSCommentDisplay()
          this.measurements = []
@ -759,39 +750,43 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-  .ecrf-wrapper{
+.ecrf-wrapper {
-    ::v-deep .el-form-item__label{
+  ::v-deep .el-form-item__label {
-      color: #c3c3c3;
+    color: #c3c3c3;
-      text-align: left;
+    text-align: left;
-    }
+  }
-    ::v-deep .el-input__inner{
+
-      background-color: transparent;
+  ::v-deep .el-input__inner {
-      color: #ddd;
+    background-color: transparent;
-      border: 1px solid #5e5e5e;
+    color: #ddd;
-    }
+    border: 1px solid #5e5e5e;
-    ::v-deep .el-textarea__inner{
+  }
-      background-color: transparent;
+
-      color: #ddd;
+  ::v-deep .el-textarea__inner {
-      border: 1px solid #5e5e5e;
+    background-color: transparent;
-    }
+    color: #ddd;
-    ::v-deep .el-form-item{
+    border: 1px solid #5e5e5e;
-      display: flex;
+  }
-      flex-direction: row;
+
-      justify-content: flex-start;
+  ::v-deep .el-form-item {
-      flex-wrap: wrap;
+    display: flex;
-    }
+    flex-direction: row;
-    ::v-deep .el-form-item__content{
+    justify-content: flex-start;
-      flex: 1;
+    flex-wrap: wrap;
-    }
+  }
-    ::v-deep .el-button--mini, .el-button--mini.is-round {
+
  ::v-deep .el-form-item__content {
    flex: 1;
  }
  ::v-deep .el-button--mini,
  .el-button--mini.is-round {
    padding: 7px 10px;
  }
-    .el-form-item__content
+
-    .el-select{
+  .el-form-item__content .el-select {
-      width: 100%;
+    width: 100%;
    }
  }
-
+}
-  </style>
+</style>
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
@ -1,12 +1,6 @@
 <template>
-  <el-form
+  <el-form v-if="isRender" ref="measurementForm" v-loading="loading" :model="questionForm" size="mini"
-    v-if="isRender"
+    class="measurement-form">
    ref="measurementForm"
    v-loading="loading"
    :model="questionForm"
    size="mini"
    class="measurement-form"
  >
    <div class="base-dialog-body">
      <div style="display: flex;justify-content: space-between;">
        <h3 v-if="lesionName" style="color: #ddd;padding: 5px 0px;margin: 0;">
@ -19,184 +13,151 @@
        </div>
      </div>
-      <el-form-item
+      <el-form-item :label="$t('trials:reading:title:lesionType')" prop="LesionType" :rules="[
-        :label="$t('trials:reading:title:lesionType')"
+        { required: true, message: $t('common:ruleMessage:select'), trigger: ['blur'] },
-        prop="LesionType"
+      ]">
        :rules="[
          { required:true,message: $t('common:ruleMessage:select'), trigger: ['blur']},
        ]"
      >
        <!-- 下拉框 -->
-        <el-select
+        <el-select v-model="questionForm.LesionType" filterable
-          v-model="questionForm.LesionType"
+          :disabled="!isCurrentTask || readingTaskState >= 2 || !isBaseLineTask"
-          filterable
+          @change="((val) => { lesionTypeChange(val) })">
          :disabled="!isCurrentTask || readingTaskState>=2 || !isBaseLineTask"
          @change="((val)=>{lesionTypeChange(val)})"
        >
-          <el-option
+          <el-option v-for="item of $d.LesionType" v-show="!(isBaseLineTask && item.value === 2)" :key="item.id"
-            v-for="item of $d.LesionType"
+            :value="item.value" :label="item.label" />
            v-show="!(isBaseLineTask && item.value === 2)"
            :key="item.id"
            :value="item.value"
            :label="item.label"
          />
        </el-select>
      </el-form-item>
      <template v-for="qs in questions">
-        <el-form-item
+        <el-form-item v-if="qs.ShowQuestion !== 2 && qs.QuestionClassify === 0" :key="qs.Id"
-          v-if="qs.ShowQuestion!==2 && qs.QuestionClassify === 0"
+          :label="`${qs.QuestionName}`" :prop="qs.Id" :rules="[
-          :key="qs.Id"
+            {
-          :label="`${qs.QuestionName}`"
+              required: (qs.IsRequired === 0 || (qs.IsRequired === 1 && qs.RelevanceId && (questionForm[qs.RelevanceId] === qs.RelevanceValue)) || (qs.QuestionMark === 6 && questionForm.IsCanEditPosition === true) || (questionForm.IsCanEditPosition && qs.QuestionMark === 10)) && qs.Type !== 'group' && qs.Type !== 'summary',
-          :prop="qs.Id"
+              message: ['radio', 'select', 'checkbox'].includes(qs.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur', 'change']
-          :rules="[
+            },
-            { required: (qs.IsRequired === 0 || (qs.IsRequired ===1 && qs.RelevanceId && (questionForm[qs.RelevanceId] === qs.RelevanceValue)) || (qs.QuestionMark === 6 && questionForm.IsCanEditPosition === true) || (questionForm.IsCanEditPosition && qs.QuestionMark === 10)) && qs.Type!=='group' && qs.Type!=='summary',
+          ]">
              message:['radio', 'select', 'checkbox'].includes(qs.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur','change']},
          ]"
        >
          <!-- {{ isCurrentTaskAdd }}
        {{ questionForm.IsCanEditPosition }} -->
          <!-- 输入框 -->
-          <template v-if="qs.Type==='input' || qs.Type==='number'">
+          <template v-if="qs.Type === 'input' || qs.Type === 'number'">
-            <!-- {{ ((qs.QuestionMark === 6 && isCurrentTaskAdd === 'False') || (qs.QuestionMark === 6 && isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition)) }} -->
+            <div style="display: flex;justify-content: space-between;">
-            <el-input
+              <!-- {{ ((qs.QuestionMark === 6 && isCurrentTaskAdd === 'False') || (qs.QuestionMark === 6 && isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition)) }} -->
-              v-if="qs.Type==='input' || qs.Type==='number'"
+              <el-input v-if="qs.Type === 'input' || qs.Type === 'number'" v-model="questionForm[qs.Id]"
-              v-model="questionForm[qs.Id]"
+                :disabled="!isCurrentTask || readingTaskState >= 2 || qs.QuestionMark === 0 || qs.QuestionMark === 1 || qs.QuestionMark === 2 || qs.QuestionMark === 5 || (qs.QuestionMark === 6 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName) && lesionType !== 2) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName))"
-              :disabled="!isCurrentTask || readingTaskState>=2 || qs.QuestionMark === 0 || qs.QuestionMark === 1 || qs.QuestionMark === 2 || qs.QuestionMark === 5 || (qs.QuestionMark === 6 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName))|| (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName) && lesionType !== 2) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName))"
+                @change="((val) => { formItemChange(val, qs) })">
-              @change="((val)=>{formItemChange(val, qs)})"
+                <template v-if="(qs.QuestionMark === 0 || qs.QuestionMark === 1) && qs.Unit" slot="append">
-            >
+                  {{ $fd('ValueUnit', parseInt(qs.Unit)) }}
-              <template v-if="(qs.QuestionMark===0 || qs.QuestionMark===1) && qs.Unit" slot="append">
+                </template>
-                {{ $fd('ValueUnit', parseInt(qs.Unit)) }}
+                <svg-icon v-if="qs.ShowChartTypeEnum > 0" icon-class="readingChart" class="svg-icon svg-readingChart"
-              </template>
+                  @click.stop="(e) => handleReadingChart({
-            </el-input>
+                    e,
                    data: {
                      TableQuestionId: qs.Id,
                      RowIndex: questionForm.RowIndex,
                      QuestionName: qs.QuestionName
                    }
                  })" />
              </el-input>
            </div>
          </template>
          <!-- 多行文本输入框 -->
-          <el-input
+          <el-input v-if="qs.Type === 'textarea'" v-model="questionForm[qs.Id]" type="textarea"
-            v-if="qs.Type==='textarea'"
+            :autosize="{ minRows: 2, maxRows: 4 }" maxlength="500" :disabled="!isCurrentTask || readingTaskState >= 2"
-            v-model="questionForm[qs.Id]"
+            @change="((val) => { formItemChange(val, qs) })" />
            type="textarea"
            :autosize="{ minRows: 2, maxRows: 4}"
            maxlength="500"
            :disabled="!isCurrentTask || readingTaskState>=2"
            @change="((val)=>{formItemChange(val, qs)})"
          />
          <!-- 下拉框 -->
-          <el-select
+          <el-select v-if="qs.Type === 'select'" v-model="questionForm[qs.Id]" filterable
            v-if="qs.Type==='select'"
            v-model="questionForm[qs.Id]"
            filterable
            :placeholder="qs.QuestionMark === 8 ? $t('common:placeholder:selectorsearch') : $t('common:placeholder:select')"
-            :disabled="!isCurrentTask || readingTaskState>=2 || qs.QuestionMark === 0 || qs.QuestionMark === 1 || qs.QuestionMark === 2 || qs.QuestionMark === 5 || (qs.QuestionMark === 6 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName))|| (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False'|| !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName))"
+            :disabled="!isCurrentTask || readingTaskState >= 2 || qs.QuestionMark === 0 || qs.QuestionMark === 1 || qs.QuestionMark === 2 || qs.QuestionMark === 5 || (qs.QuestionMark === 6 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName))"
-            @change="((val)=>{formItemChange(val, qs)})"
+            @change="((val) => { formItemChange(val, qs) })">
          >
            <template v-if="qs.QuestionMark === 8" #prefix>
              <span style="padding-left: 5px;">
                <i class="el-icon-search" />
              </span>
            </template>
            <template v-if="qs.TableQuestionType === 1">
-              <el-option
+              <el-option v-for="item in organList" :key="item.Id" :label="item[qs.DataTableColumn]"
-                v-for="item in organList"
+                :value="item[qs.DataTableColumn]" />
                :key="item.Id"
                :label="item[qs.DataTableColumn]"
                :value="item[qs.DataTableColumn]"
              />
            </template>
            <template v-else-if="qs.DictionaryCode && qs.QuestionMark !== 7">
-              <el-option
+              <el-option v-for="item of $d[qs.DictionaryCode]" :key="item.id" :value="item.value" :label="item.label" />
                v-for="item of $d[qs.DictionaryCode]"
                :key="item.id"
                :value="item.value"
                :label="item.label"
              />
            </template>
            <template v-else>
-              <el-option
+              <el-option v-for="val in qs.TypeValue.split('|')" :key="val" :label="val" :value="val" />
                v-for="val in qs.TypeValue.split('|')"
                :key="val"
                :label="val"
                :value="val"
              />
            </template>
          </el-select>
          <!-- 单选 -->
-          <el-radio-group
+          <el-radio-group v-if="qs.Type === 'radio'" v-model="questionForm[qs.id]"
-            v-if="qs.Type==='radio'"
+            :disabled="!isCurrentTask || readingTaskState >= 2">
-            v-model="questionForm[qs.id]"
+            <el-radio v-for="val in qs.options.split('|')" :key="val" :label="val">
            :disabled="!isCurrentTask || readingTaskState>=2"
          >
            <el-radio
              v-for="val in qs.options.split('|')"
              :key="val"
              :label="val"
            >
              {{ val }}
            </el-radio>
          </el-radio-group>
-          <template v-if="qs.QuestionMark === 20 && qs.Type==='calculation'">
+          <template v-if="qs.QuestionMark === 20 && qs.Type === 'calculation'">
            <div style="display: flex;flex-direction: row;justify-content: flex-start;">
-              <el-input
+              <div style="display: flex;justify-content: space-between;">
-                v-if="qs.Type==='calculation'"
+                <el-input v-if="qs.Type === 'calculation'" v-model="questionForm[qs.Id]" disabled style="width:120px;">
-                v-model="questionForm[qs.Id]"
+                  <template v-if="qs.Unit" slot="append">
-                disabled
+                    {{ $fd('ValueUnit', parseInt(qs.Unit)) }}
-                style="width:120px;"
+                  </template>
-              >
+                </el-input>
-                <template v-if="qs.Unit" slot="append">
+                <svg-icon v-if="qs.ShowChartTypeEnum > 0" icon-class="readingChart" class="svg-icon svg-readingChart"
-                  {{ $fd('ValueUnit', parseInt(qs.Unit)) }}
+                  @click.stop="(e) => handleReadingChart({
-                </template>
+                    e,
-              </el-input>
+                    data: {
                      TableQuestionId: qs.Id,
                      RowIndex: questionForm.RowIndex,
                      QuestionName: qs.QuestionName
                    }
                  })" />
              </div>
              <!-- <span style="color:#409eff;cursor: pointer" @click="previewImages(answers.RowId)">
                {{ $t('trials:lugano:button:suvscreenshot') }}
              </span> -->
-              <el-button v-if="!isBaseLineTask" type="text" @click="previewImages(answers.RowId)">{{ $t('trials:lugano:button:suvscreenshot') }}</el-button>
+              <el-button v-if="!isBaseLineTask" type="text" @click="previewImages(answers.RowId)">{{
                $t('trials:lugano:button:suvscreenshot') }}</el-button>
            </div>
          </template>
-          <el-input
+          <div style="display: flex;justify-content: space-between;"
-            v-else-if="qs.Type==='calculation' && qs.QuestionMark !== 20"
+            v-else-if="qs.Type === 'calculation' && qs.QuestionMark !== 20">
-            v-model="questionForm[qs.Id]"
+            <el-input v-model="questionForm[qs.Id]" disabled>
-            disabled
+              <template v-if="qs.Unit" slot="append">
-          >
+                {{ $fd('ValueUnit', parseInt(qs.Unit)) }}
-            <template v-if="qs.Unit" slot="append">
+              </template>
-              {{ $fd('ValueUnit', parseInt(qs.Unit)) }}
+            </el-input>
-            </template>
+            <svg-icon v-if="qs.ShowChartTypeEnum > 0" icon-class="readingChart" class="svg-icon svg-readingChart"
-          </el-input>
+              @click.stop="(e) => handleReadingChart({
                e,
                data: {
                  TableQuestionId: qs.Id,
                  RowIndex: questionForm.RowIndex,
                  QuestionName: qs.QuestionName
                }
              })" />
          </div>
        </el-form-item>
      </template>
    </div>
-    <div
+    <div v-if="isCurrentTask && readingTaskState < 2" class="base-dialog-footer"
-      v-if="isCurrentTask && readingTaskState<2"
+      style="text-align:right;margin-top:10px;">
      class="base-dialog-footer"
      style="text-align:right;margin-top:10px;"
    >
      <!-- 清除标记  -->
-      <el-button
+      <el-button v-if="questionForm.OtherMeasureData" size="mini" @click="handleDeleteMeasureData">
        v-if="questionForm.OtherMeasureData"
        size="mini"
        @click="handleDeleteMeasureData"
      >
        {{ $t('trials:reading:button:removeMark') }}
      </el-button>
      <!-- 删除 -->
-      <el-button
+      <el-button v-if="isCurrentTaskAdd !== 'False'" size="mini" @click="handleDelete">
        v-if="isCurrentTaskAdd !== 'False'"
        size="mini"
        @click="handleDelete"
      >
        {{ $t('common:button:delete') }}
      </el-button>
      <!-- 保存 -->
-      <el-button
+      <el-button size="mini" @click="handleSave">
        size="mini"
        @click="handleSave"
      >
        {{ $t('common:button:save') }}
      </el-button>
    </div>
@ -288,6 +249,9 @@ export default {
  },
  methods: {
    handleReadingChart(e) {
      this.$emit('handleReadingChart', e)
    },
    async initForm(isRerender = false) {
      const loading = this.$loading({ fullscreen: true })
      this.questions.forEach(item => {
@ -341,7 +305,7 @@ export default {
        await this.setMeasureData(this.answers.measureObj, true)
      } else {
        if (this.questionForm.MeasureData) {
-        // 十字线工具 且是靶病灶  器官只能是淋巴结类型
+          // 十字线工具 且是靶病灶  器官只能是淋巴结类型
          // if (this.answers.MarkTool === 'Bidirectional') {
          //   this.organList = []
          //   await this.getOrganInfoList(1)
@ -446,8 +410,8 @@ export default {
              type: 'warning',
              distinguishCancelAndClose: true
            })
-              .then(() => {})
+              .then(() => { })
-              .catch(() => {})
+              .catch(() => { })
            this.$set(this.questionForm, 'LesionType', this.originalQuestionForm.LesionType)
            return
          }
@ -459,7 +423,7 @@ export default {
            this.$confirm(msg, {
              type: 'warning',
              showCancelButton: false,
-              callback: action => {}
+              callback: action => { }
            })
            this.$set(this.questionForm, 'LesionType', this.originalQuestionForm.LesionType)
            return
@ -786,7 +750,7 @@ export default {
          this.$confirm(this.$t('trials:reading:lugano:warnning:outsideVolume'), {
            type: 'warning',
            showCancelButton: false,
-            callback: action => {}
+            callback: action => { }
          })
          return
@ -800,7 +764,7 @@ export default {
          this.$confirm(this.$t('trials:reading:lugano:warnning:cannotMeasuredSUV'), {
            type: 'warning',
            showCancelButton: false,
-            callback: action => {}
+            callback: action => { }
          })
          return
        }
@ -813,7 +777,7 @@ export default {
            this.$confirm(this.$t('trials:reading:lugano:warnning:suvis0'), {
              type: 'warning',
              showCancelButton: false,
-              callback: action => {}
+              callback: action => { }
            })
            return
          }
@ -1054,47 +1018,57 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.measurement-form{
+.measurement-form {
-  ::v-deep .el-form-item__label{
+  ::v-deep .el-form-item__label {
    color: #c3c3c3;
    // text-align: left;
  }
-  ::v-deep .el-input .el-input__inner{
+
  ::v-deep .el-input .el-input__inner {
    background-color: transparent;
    color: #ddd;
    border: 1px solid #5e5e5e;
  }
-  ::v-deep .el-form-item{
+
  ::v-deep .el-form-item {
    display: flex;
    flex-direction: row;
    justify-content: flex-start;
    flex-wrap: wrap;
  }
-  ::v-deep .el-form-item__content{
+
  ::v-deep .el-form-item__content {
    flex: 1;
  }
-  ::v-deep .el-input.is-disabled .el-input__inner{
+
  ::v-deep .el-input.is-disabled .el-input__inner {
    background-color: #646464a1;
  }
-  ::v-deep .el-input-group__append, .el-input-group__prepend{
+
  ::v-deep .el-input-group__append,
  .el-input-group__prepend {
    padding: 0 10px;
  }
-  ::v-deep .el-select.is-disabled .el-input__inner{
+
  ::v-deep .el-select.is-disabled .el-input__inner {
    background-color: #646464a1;
  }
-  ::v-deep .el-button--mini, .el-button--mini.is-round {
+
  ::v-deep .el-button--mini,
  .el-button--mini.is-round {
    padding: 7px 10px;
  }
-  .el-form-item__content
+
-  .el-select{
+  .el-form-item__content .el-select {
    width: 100%;
  }
-  .input-width1{
+
-    width: calc(100% - 60px)!important;
+  .input-width1 {
    width: calc(100% - 60px) !important;
  }
-  .input-width2{
+
  .input-width2 {
    width: 100% !important;
  }
 }
 </style>
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestions.vue
@ -3,75 +3,88 @@
    <div class="container">
      <!-- 测量问题 -->
-      <template v-for="(qs,index) in questions">
+      <template v-for="(qs, index) in questions">
        <div v-if="qs.QuestionClassify === 0" :key="index" v-loading="loading" class="lesions lesions_wrapper">
          <h4 v-if="qs.Type === 'group'" style="color: #ddd;padding: 5px 0px;margin: 0;">
-            {{ language==='en'?qs.GroupEnName:qs.GroupName }}
+            {{ language === 'en' ? qs.GroupEnName : qs.GroupName }}
          </h4>
          <div class="lesion_list">
            <template v-for="item in qs.Childrens">
              <div v-if="item.QuestionClassify === 0 && !(isBaseLineTask && item.LesionType === 2)" :key="item.Id">
                <div v-if="item.Type === 'table'" class="flex-row" style="margin:3px 0;">
-                  <div class="title">{{ item.QuestionName }}</div>
+                  <div class="title">{{ item.QuestionName }}
-                  <div v-if="readingTaskState<2 && (isBaseLineTask || item.LesionType === 2)" class="add-icon" @click.prevent="handleAdd(item)">
+                    <svg-icon v-if="item.LesionType === 0" icon-class="readingChart"
                      class="svg-icon svg-readingChart-mini" @click.stop="(e) => handleReadingChart({
                        e,
                        data: {
                          ReportChartTypeEnum: 0,
                          QuestionName: item.QuestionName
                        },
                      })" />
                  </div>
                  <div v-if="readingTaskState < 2 && (isBaseLineTask || item.LesionType === 2)" class="add-icon"
                    @click.prevent="handleAdd(item)">
                    <i class="el-icon-plus" />
                  </div>
                </div>
                <!-- @change="handleCollapseChange(qs.Childrens,item)" -->
-                <el-collapse
+                <el-collapse v-if="item.Type === 'table' && item.TableQuestions" v-model="activeName" accordion
-                  v-if="item.Type === 'table' && item.TableQuestions"
+                  @change="handleCollapseChange">
-                  v-model="activeName"
+                  <el-collapse-item v-for="(q, i) in item.TableQuestions.Answers" :key="`${item.Id}_${q.RowIndex}`"
                  accordion
                  @change="handleCollapseChange"
                >
                  <el-collapse-item
                    v-for="(q,i) in item.TableQuestions.Answers"
                    :key="`${item.Id}_${q.RowIndex}`"
                    :name="`${item.Id}_${q.RowIndex}`"
-                    @contextmenu.prevent.native="collapseRightClick($event,q,item.Id,q.RowIndex)"
+                    @contextmenu.prevent.native="collapseRightClick($event, q, item.Id, q.RowIndex)">
                  >
                    <template slot="title">
-                      <div style="width:300px;position: relative;" :style="{color:(activeName===item.Id+q.RowIndex?'#ffeb3b':'#fff')}">
+                      <div style="width:300px;position: relative;"
                        :style="{ color: (activeName === item.Id + q.RowIndex ? '#ffeb3b' : '#fff') }">
-                        {{ getLesionName(item.OrderMark,q.RowIndex) }}
+                        {{ getLesionName(item.OrderMark, q.RowIndex) }}
                        <!-- 未保存 -->
-                        <el-tooltip v-if="readingTaskState<2 && parseInt(item.TableQuestions.Answers[i].saveTypeEnum) === 0" class="item" effect="dark" :content="$t('trials:reading:button:unsaved')" placement="bottom">
+                        <el-tooltip
                          v-if="readingTaskState < 2 && parseInt(item.TableQuestions.Answers[i].saveTypeEnum) === 0"
                          class="item" effect="dark" :content="$t('trials:reading:button:unsaved')" placement="bottom">
                          <i class="el-icon-warning" style="color:red" />
                        </el-tooltip>
                        <!-- 信息不完整 -->
-                        <el-tooltip v-if="readingTaskState<2 && parseInt(item.TableQuestions.Answers[i].saveTypeEnum) ===1" class="item" effect="dark" :content="$t('trials:reading:button:incompleteInfor')" placement="bottom">
+                        <el-tooltip
                          v-if="readingTaskState < 2 && parseInt(item.TableQuestions.Answers[i].saveTypeEnum) === 1"
                          class="item" effect="dark" :content="$t('trials:reading:button:incompleteInfor')"
                          placement="bottom">
                          <i class="el-icon-warning" style="color:#ff9800" />
                        </el-tooltip>
                        <div style="position: absolute;left: 50px;top: 2px;">
                          <!-- white-space: nowrap;overflow: hidden;text-overflow: ellipsis; -->
                          <div style="font-size: 11px;width:220px;height: 30px;">
-                            <div
+                            <div v-if="item.TableQuestions.Answers[i].lesionPart"
-                              v-if="item.TableQuestions.Answers[i].lesionPart"
+                              style="margin-left:10px;display: inline-block; white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:90px">
-                              style="margin-left:10px;display: inline-block; white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:90px"
+                              <el-tooltip v-if="!!item.TableQuestions.Answers[i].lesionPart" class="item" effect="dark"
-                            >
+                                :content="item.TableQuestions.Answers[i].lesionPart" placement="bottom">
                              <el-tooltip v-if="!!item.TableQuestions.Answers[i].lesionPart" class="item" effect="dark" :content="item.TableQuestions.Answers[i].lesionPart" placement="bottom">
                                <span>{{ item.TableQuestions.Answers[i].lesionPart }}</span>
                              </el-tooltip>
                            </div>
-                            <div style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:50px">
+                            <div
                              style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:50px">
                              <span v-if="item.LesionType === 0">
-                                {{ $fd('TargetState',parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                                {{ $fd('TargetState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
                              </span>
                              <span v-else-if="item.LesionType === 1">
-                                {{ $fd('NoTargetState',parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                                {{ $fd('NoTargetState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
                              </span>
                              <span v-else>
-                                {{ $fd('NewLesionState',parseInt(item.TableQuestions.Answers[i].lesionState)) }}
+                                {{ $fd('NewLesionState', parseInt(item.TableQuestions.Answers[i].lesionState)) }}
                              </span>
                            </div>
-                            <div style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:60px;color:red;">
+                            <div
-                              <template v-if="item.TableQuestions.Answers[i].suvMax && !isNaN(parseFloat(item.TableQuestions.Answers[i].suvMax))">
+                              style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:60px;color:red;">
                              <template
                                v-if="item.TableQuestions.Answers[i].suvMax && !isNaN(parseFloat(item.TableQuestions.Answers[i].suvMax))">
                                {{ item.TableQuestions.Answers[i].suvMax }} SUV
                              </template>
                            </div>
                          </div>
                        </div>
-                        <div v-if="((item.LesionType === 0 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 1 && [0,1].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 2 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0)) && item.TableQuestions.Answers[i].IsCurrentTaskAdd === 'False'" style="position: absolute;right: 5px;top: 2px;transform: rotateY(180deg);">
+                        <div
                          v-if="((item.LesionType === 0 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 1 && [0, 1].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 2 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0)) && item.TableQuestions.Answers[i].IsCurrentTaskAdd === 'False'"
                          style="position: absolute;right: 5px;top: 2px;transform: rotateY(180deg);">
                          <!-- 分裂 -->
                          <!-- <el-tooltip v-show="readingTaskState<2 && !!item.TableQuestions.Answers[i].RowId && !isBaseLineTask" class="item" :content="$t('trials:reading:button:split')" placement="left">
                            <i class="iconfont icon-24gl-split" style="color:#fff;font-size: 16px;" @click.stop="handleSplit(item.TableQuestions.Answers[i].RowId,item.Id)" />
@ -81,25 +94,14 @@
                      </div>
                    </template>
-                    <QuestionForm
+                    <QuestionForm :ref="`${item.Id}_${q.RowIndex}`" :questions="item.TableQuestions.Questions"
-                      :ref="`${item.Id}_${q.RowIndex}`"
+                      :answers="item.TableQuestions.Answers[i]" :lesion-type="item.LesionType"
-                      :questions="item.TableQuestions.Questions"
+                      :order-mark="item.OrderMark" :table-questions="tableQuestions" :row-index="String(q.RowIndex)"
-                      :answers="item.TableQuestions.Answers[i]"
+                      :question-name="item.QuestionName" :parent-qs-id="item.Id" :visit-task-id="visitTaskId"
-                      :lesion-type="item.LesionType"
+                      :is-current-task="isCurrentTask" :reading-task-state="readingTaskState"
-                      :order-mark="item.OrderMark"
+                      :is-base-line-task="isBaseLineTask" @changeLesionType="changeLesionType"
-                      :table-questions="tableQuestions"
+                      @resetQuestions="resetQuestions" @determineExistsUnsavedLession="determineExistsUnsavedLession"
-                      :row-index="String(q.RowIndex)"
+                      @close="close" @handleReadingChart="handleReadingChart" />
                      :question-name="item.QuestionName"
                      :parent-qs-id="item.Id"
                      :visit-task-id="visitTaskId"
                      :is-current-task="isCurrentTask"
                      :reading-task-state="readingTaskState"
                      :is-base-line-task="isBaseLineTask"
                      @changeLesionType="changeLesionType"
                      @resetQuestions="resetQuestions"
                      @determineExistsUnsavedLession="determineExistsUnsavedLession"
                      @close="close"
                    />
                  </el-collapse-item>
                </el-collapse>
@ -170,6 +172,9 @@ export default {
  beforeDestroy() {
  },
  methods: {
    handleReadingChart(e) {
      this.$emit('handleReadingChart', e)
    },
    initList(isRerender = false) {
      this.loading = true
      this.activeName = ''
@ -345,7 +350,7 @@ export default {
              .then(() => {
                this.split(rowId, questionId)
              })
-              .catch(() => {})
+              .catch(() => { })
          } else {
            // 是否确认分裂
            this.$confirm(this.$t('trials:reading:warnning:msg4'), {
@ -355,7 +360,7 @@ export default {
              .then(() => {
                this.split(rowId, questionId)
              })
-              .catch(() => {})
+              .catch(() => { })
          }
        }
      }
@ -429,7 +434,7 @@ export default {
        this.$confirm(msg, {
          type: 'warning',
          showCancelButton: false,
-          callback: action => {}
+          callback: action => { }
        })
        return
      }
@ -439,7 +444,7 @@ export default {
        this.$confirm(msg, {
          type: 'warning',
          showCancelButton: false,
-          callback: action => {}
+          callback: action => { }
        })
      } else {
        // saveTypeEnum: 0
@ -582,7 +587,7 @@ export default {
      // await store.dispatch('reading/removeReadingQuestionAndAnswer', { lesionType: questionsObj.oldLesionType, rowIndex: questionsObj.rowIndex, visitTaskId: this.visitTaskId })
      this.questions = this.findQuestionAndRemoveLesion(this.questions, { lesionType: questionsObj.oldLesionType, rowIndex: questionsObj.rowIndex })
      // saveTypeEnum: 0
-      var lesionObj = { }
+      var lesionObj = {}
      var questionObj = questionsObj.questionForm
      // 切换到新的病灶集合
      var targetObj = this.tableQuestions.find(item => item.LesionType === questionsObj.newLesionType)
@ -817,19 +822,20 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.measurement-wrapper{
+.measurement-wrapper {
  // .container{
  //   padding: 10px;
  // }
-  .title{
+  .title {
    padding: 5px;
    font-weight: bold;
    color: #ddd;
    font-size: 15px;
  }
-  .add-icon{
+
  .add-icon {
    padding: 5px;
    font-weight: bold;
    color: #ddd;
@ -838,42 +844,49 @@ export default {
    margin-bottom: 2px;
    cursor: pointer;
  }
-  .add-icon:hover{
+
  .add-icon:hover {
    background-color: #607d8b;
  }
-  .flex-row{
+  .flex-row {
    display: flex;
    flex-direction: row;
    justify-content: space-between;
    background-color: #424242;
  }
-  .lesion_list{
+
  .lesion_list {
    position: relative;
  }
-  .el-collapse{
+
-    border-bottom:none;
+  .el-collapse {
-    border-top:none;
+    border-bottom: none;
-    ::v-deep .el-collapse-item{
+    border-top: none;
-      background-color: #000!important;
+
    ::v-deep .el-collapse-item {
      background-color: #000 !important;
      color: #ddd;
    }
-    ::v-deep .el-collapse-item__header{
+
-      background-color: #000!important;
+    ::v-deep .el-collapse-item__header {
      background-color: #000 !important;
      color: #ddd;
-      border-bottom-color:#5a5a5a;
+      border-bottom-color: #5a5a5a;
      padding-left: 5px;
      height: 35px;
      line-height: 35px;
    }
-    ::v-deep .el-collapse-item__wrap{
+
-      background-color: #000!important;
+    ::v-deep .el-collapse-item__wrap {
      background-color: #000 !important;
      color: #ddd;
    }
-    ::v-deep .el-collapse-item__content{
+
-      width:260px;
+    ::v-deep .el-collapse-item__content {
      width: 260px;
      position: absolute;
      top: 0px;
      right: 0px;
@ -882,7 +895,7 @@ export default {
      z-index: 1;
      color: #ddd;
      padding: 5px;
-      background-color:#1e1e1e;
+      background-color: #1e1e1e;
    }
  }
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/js/imagePixelSpacingMetaDataProvider.js
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/js/imagePixelSpacingMetaDataProvider.js
@ -0,0 +1,193 @@
 import cornerstoneDICOMImageLoader from '@cornerstonejs/dicom-image-loader'
 function parseImageId(imageId) {
  // build a url by parsing out the url scheme and frame index from the imageId
  const firstColonIndex = imageId.indexOf(':');
  let url = imageId.substring(firstColonIndex + 1);
  const frameIndex = url.indexOf('frame=');
  let frame;
  if (frameIndex !== -1) {
    const frameStr = url.substr(frameIndex + 6);
    frame = parseInt(frameStr, 10);
    url = url.substr(0, frameIndex - 1);
  }
  return {
    scheme: imageId.substr(0, firstColonIndex),
    url,
    frame,
  };
 }
 function getNumberValues(dataSet, tag, minimumLength) {
  const values = [];
  const valueAsString = dataSet.string(tag);
  if (!valueAsString) {
    return;
  }
  const split = valueAsString.split('\\');
  if (minimumLength && split.length < minimumLength) {
    return;
  }
  for (let i = 0; i < split.length; i++) {
    values.push(parseFloat(split[i]));
  }
  return values;
 }
 function getImageTypeSubItemFromDataset(dataSet, index) {
  const imageType = dataSet.string('x00080008');
  if (imageType) {
      const subTypes = imageType.split('\\');
      if (subTypes.length > index) {
          return subTypes[index];
      }
  }
  return undefined;
 }
 function isNMReconstructable(imageSubType) {
  return imageSubType === 'RECON TOMO' || imageSubType === 'RECON GATED TOMO';
 }
 function extractOrientationFromNMMultiframeDataset(dataSet) {
  let imageOrientationPatient;
  const modality = dataSet.string('x00080060');
  if (modality?.includes('NM')) {
      const imageSubType = getImageTypeSubItemFromDataset(dataSet, 2);
      if (imageSubType && isNMReconstructable(imageSubType)) {
          if (dataSet.elements.x00540022) {
              imageOrientationPatient = getNumberValues(dataSet.elements.x00540022.items[0].dataSet, 'x00200037', 6);
          }
      }
  }
  return imageOrientationPatient;
 }
 function extractOrientationFromDataset(dataSet) {
  let imageOrientationPatient = getNumberValues(dataSet, 'x00200037', 6);
  if (!imageOrientationPatient && dataSet.elements.x00209116) {
      imageOrientationPatient = getNumberValues(dataSet.elements.x00209116.items[0].dataSet, 'x00200037', 6);
  }
  if (!imageOrientationPatient) {
      imageOrientationPatient =
          extractOrientationFromNMMultiframeDataset(dataSet);
  }
  return imageOrientationPatient;
 }
 function extractPositionFromNMMultiframeDataset(dataSet) {
  let imagePositionPatient;
  const modality = dataSet.string('x00080060');
  if (modality?.includes('NM')) {
      const imageSubType = getImageTypeSubItemFromDataset(dataSet, 2);
      if (imageSubType && isNMReconstructable(imageSubType)) {
          if (dataSet.elements.x00540022) {
              imagePositionPatient = getNumberValues(dataSet.elements.x00540022.items[0].dataSet, 'x00200032', 3);
          }
      }
  }
  return imagePositionPatient;
 }
 function extractPositionFromDataset(dataSet) {
  let imagePositionPatient = getNumberValues(dataSet, 'x00200032', 3);
  if (!imagePositionPatient && dataSet.elements.x00209113) {
      imagePositionPatient = getNumberValues(dataSet.elements.x00209113.items[0].dataSet, 'x00200032', 3);
  }
  if (!imagePositionPatient) {
      imagePositionPatient = extractPositionFromNMMultiframeDataset(dataSet);
  }
  return imagePositionPatient;
 }
 function extractSliceThicknessFromDataset(dataSet) {
  let sliceThickness;
  if (dataSet.elements.x00180050) {
      sliceThickness = dataSet.floatString('x00180050');
  }
  else if (dataSet.elements.x00289110 &&
      dataSet.elements.x00289110.items.length &&
      dataSet.elements.x00289110.items[0].dataSet.elements.x00180050) {
      sliceThickness =
          dataSet.elements.x00289110.items[0].dataSet.floatString('x00180050');
  }
  return sliceThickness;
 }
 function extractSpacingFromDataset(dataSet) {
  let rowPixelSpacing = null
  let columnPixelSpacing = null
  let pixelSpacing = getNumberValues(dataSet, 'x00280030', 2);
  const imagePixelSpacing = getNumberValues(dataSet, 'x00181164', 2);
  const estimatedRadiographicMagnificationFactor = getNumberValues(dataSet, 'x00181114', 2);
  if (pixelSpacing) {
      rowPixelSpacing = pixelSpacing[0]
      columnPixelSpacing = pixelSpacing[1]
    } else if (imagePixelSpacing && estimatedRadiographicMagnificationFactor) {
      rowPixelSpacing = imagePixelSpacing[0] / estimatedRadiographicMagnificationFactor[0];
      columnPixelSpacing = imagePixelSpacing[1] / estimatedRadiographicMagnificationFactor[1];
    } else if (imagePixelSpacing && !estimatedRadiographicMagnificationFactor) {
      rowPixelSpacing = imagePixelSpacing[0];
      columnPixelSpacing = imagePixelSpacing[1];
    }
  return rowPixelSpacing !== null ? [rowPixelSpacing, columnPixelSpacing] : undefined
 }
 function metaDataProvider(type, imageId) {
  const parsedImageId = parseImageId(imageId);
  const dataSet = cornerstoneDICOMImageLoader.wadouri.dataSetCacheManager.get(parsedImageId.url)
  if (!dataSet) {
    return;
  }
  if (type === 'imagePlaneModule') {
    const imageOrientationPatient = getNumberValues(dataSet, 'x00200037', 6);
    const imagePositionPatient = getNumberValues(dataSet, 'x00200032', 3);
    const pixelSpacing = extractSpacingFromDataset(dataSet);
    let rowCosines = null;
    let columnCosines = null;
    if (imageOrientationPatient) {
      rowCosines = [
        parseFloat(imageOrientationPatient[0]),
        parseFloat(imageOrientationPatient[1]),
        parseFloat(imageOrientationPatient[2]),
      ];
      columnCosines = [
        parseFloat(imageOrientationPatient[3]),
        parseFloat(imageOrientationPatient[4]),
        parseFloat(imageOrientationPatient[5]),
      ];
    }
    return {
      frameOfReferenceUID: dataSet.string('x00200052'),
      rows: dataSet.uint16('x00280010'),
      columns: dataSet.uint16('x00280011'),
      imageOrientationPatient,
      rowCosines,
      columnCosines,
      imagePositionPatient,
      sliceThickness: dataSet.floatString('x00180050'),
      sliceLocation: dataSet.floatString('x00201041'),
      pixelSpacing: pixelSpacing,
      rowPixelSpacing: pixelSpacing ? pixelSpacing[0] : null,
      columnPixelSpacing: pixelSpacing ? pixelSpacing[1] : null,
    };
  }
  if (type === 'nmMultiframeGeometryModule') {
    const modality = dataSet.string('x00080060');
      const imageSubType = getImageTypeSubItemFromDataset(dataSet, 2);
      return {
          modality,
          imageType: dataSet.string('x00080008'),
          imageSubType,
          imageOrientationPatient: extractOrientationFromDataset(dataSet),
          imagePositionPatient: extractPositionFromDataset(dataSet),
          sliceThickness: extractSliceThicknessFromDataset(dataSet),
          pixelSpacing: extractSpacingFromDataset(dataSet),
          numberOfFrames: dataSet.uint16('x00280008'),
          isNMReconstructable: isNMReconstructable(imageSubType) && modality.includes('NM'),
      };
  }
 }
 export default metaDataProvider;
--- 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>