1

# Conflicts:
#	src/components/clinicalDataQuestions/components/QuestionFormItem.vue
#	src/components/clinicalDataQuestions/components/QuestionsForm.vue
#	src/components/clinicalDataQuestions/index.vue
#	src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
#	src/views/trials/trials-panel/visit/qc-check/components/questions.vue

package-lock.json

@@ -48,6 +48,7 @@
         "nprogress": "^0.2.0",
         "path-to-regexp": "^0.1.10",
         "pdfobject": "^2.3.0",
+        "prismjs": "^1.30.0",
         "qrcodejs2": "^0.0.2",
         "screenfull": "^6.0.2",
         "sortablejs": "^1.15.5",
@@ -62,6 +63,7 @@
         "vue-count-to": "^1.0.13",
         "vue-demi": "^0.14.10",
         "vue-i18n": "^8.28.2",
+        "vue-prism-editor": "^1.3.0",
         "vue-puzzle-vcode": "^1.1.10",
         "vue-router": "^3.0.6",
         "vue-seamless-scroll": "^1.1.23",
@@ -18044,6 +18046,15 @@
         "renderkid": "^3.0.0"
       }
     },
+    "node_modules/prismjs": {
+      "version": "1.30.0",
+      "resolved": "https://registry.npmmirror.com/prismjs/-/prismjs-1.30.0.tgz",
+      "integrity": "sha512-DEvV2ZF2r2/63V+tK8hQvrR2ZGn10srHbXviTlcv7Kpzw8jWiNTqbVgjO3IY8RxrrOUF8VPMQQFysYYYv0YZxw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/process": {
       "version": "0.11.10",
       "resolved": "https://registry.npmmirror.com/process/-/process-0.11.10.tgz",
@@ -22997,6 +23008,18 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
+    "node_modules/vue-prism-editor": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmmirror.com/vue-prism-editor/-/vue-prism-editor-1.3.0.tgz",
+      "integrity": "sha512-54RfgtMGRMNr9484zKMOZs1wyLDR6EfFylzE2QrMCD9alCvXyYYcS0vX8oUHh+6pMUu6ts59uSN9cHglpU2NRQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "vue": "^2.6.11"
+      }
+    },
     "node_modules/vue-puzzle-vcode": {
       "version": "1.1.10",
       "resolved": "https://registry.npmmirror.com/vue-puzzle-vcode/-/vue-puzzle-vcode-1.1.10.tgz",

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",
@@ -54,6 +55,7 @@
     "nprogress": "^0.2.0",
     "path-to-regexp": "^0.1.10",
     "pdfobject": "^2.3.0",
+    "prismjs": "^1.30.0",
     "qrcodejs2": "^0.0.2",
     "screenfull": "^6.0.2",
     "sortablejs": "^1.15.5",
@@ -68,6 +70,7 @@
     "vue-count-to": "^1.0.13",
     "vue-demi": "^0.14.10",
     "vue-i18n": "^8.28.2",
+    "vue-prism-editor": "^1.3.0",
     "vue-puzzle-vcode": "^1.1.10",
     "vue-router": "^3.0.6",
     "vue-seamless-scroll": "^1.1.23",

public/index.html

@@ -11,6 +11,14 @@
     <meta http-equiv="Cache-control" content="no-store,no-cache,must-revalidate">
     <meta http-equiv="Cache" content="no-cache">
     <title><%= webpackConfig.name %></title>
+    <style>
+      .customPromptTip {
+        position: absolute;
+        left: 0;
+        bottom: -100px;
+        z-index: 99999;
+      }
+    </style>
     <% if (eval(process.env.VUE_APP_LOGIN_FOR_PERMISSION)) { %>
     <script>
         window.zzSessionStorage = {

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
+  })
+}

src/api/dictionary.js

@@ -281,7 +281,13 @@ export function getCommonDocumentList(param) {
     data: param
   })
 }
-
+export function getCommonDocument(param) {
+  return request({
+    url: `/CommonDocument/getCommonDocument`,
+    method: 'get',
+    params: param
+  })
+}
 export function addOrUpdateCommonDocument(param) {
   return request({
     url: `/CommonDocument/addOrUpdateCommonDocument`,
@@ -418,10 +424,11 @@ export function addOrUpdateBasicDic(param) {
   })
 }
 
-export function getDictionaryChildList(id) {
+export function getDictionaryChildList(data) {
   return request({
-    url: `/Dictionary/getChildList/${id}`,
+    url: `/Dictionary/getChildList`,
-    method: 'get'
+    method: 'post',
+    data
   })
 }
 
@@ -1357,3 +1364,113 @@ export function deleteAttachment(data) {
     data
   })
 }
+// 项目文档-获取历史记录列表
+export function getTrialHistoryRecordFileList(data) {
+  return request({
+    url: `/TrialHistoryRecordFile/getTrialHistoryRecordFileList`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-新增/修改历史记录
+export function addOrUpdateTrialHistoryRecordFile(data) {
+  return request({
+    url: `/TrialHistoryRecordFile/addOrUpdateTrialHistoryRecordFile`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-批量新增历史记录
+export function batchAddTrialHistoryRecordFile(data) {
+  return request({
+    url: `/TrialHistoryRecordFile/batchAddTrialHistoryRecordFile`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-删除历史记录
+export function deleteTrialHistoryRecordFile(id) {
+  return request({
+    url: `/TrialHistoryRecordFile/deleteTrialHistoryRecordFile/${id}`,
+    method: 'delete',
+  })
+}
+// 邮件管理-批量修改邮件
+export function batchUpdateEmail(data) {
+  return request({
+    url: `/EmailNoticeConfig/batchUpdateEmail`,
+    method: 'post',
+    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'
+  })
+}

src/api/dictionary/checkConfig.js

@@ -45,10 +45,19 @@ export function changeFrontAuditSort(param) {
   })
 }
 
-export function getModuleTypeDescriptionList(param) {
+export function getModuleTypeDescriptionList(params) {
   return request({
-    url: `${param === '' ? '/FrontAuditConfig/getModuleTypeDescriptionList' : '/FrontAuditConfig/getModuleTypeDescriptionList?moduleTypeId=' + param}`,
+    url: `/FrontAuditConfig/getModuleTypeDescriptionList`,
-    method: 'get'
+    method: 'get',
+    params
+  })
+}
+
+export function getModuleTypeList(data) {
+  return request({
+    url: `/FrontAuditConfig/getModuleTypeList`,
+    method: 'post',
+    data
   })
 }
 

src/api/export.js

@@ -72,7 +72,14 @@ export function getReadingTaskList_Export(param) {
     data: param
   })
 }
-
+export function getTrialVisitImageStatList_Export(param) {
+  return requestDownload({
+    url: '/ExcelExport/getTrialVisitImageStatList_Export',
+    method: 'post',
+    responseType: 'blob',
+    data: param
+  })
+}
 export function getReReadingTaskList_Export(param) {
   return requestDownload({
     url: '/ExcelExport/getReReadingTaskList_Export',
@@ -196,6 +203,15 @@ export function qCVisitList_Export(data) {
     data
   })
 }
+// 导出影像指控问题和答案
+export function GetTrialQCQuestionAnserList_Export(data) {
+  return requestDownload({
+    url: `/ExcelExport/GetTrialQCQuestionAnserList_Export`,
+    responseType: 'blob',
+    method: 'post',
+    data
+  })
+}
 // 导出下载记录
 export function getTrialDownloadList_Export(data) {
   return requestDownload({
@@ -239,6 +255,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({
@@ -266,3 +290,21 @@ export function GetEmailNoticeConfigList_Export(data) {
     data
   })
 }
+// 导出重传审批
+export function GetImageBackList_Export(data) {
+  return requestDownload({
+    url: `/ExcelExport/GetImageBackList_Export`,
+    responseType: 'blob',
+    method: 'post',
+    data
+  })
+}
+// 导出医学审核配置
+export function GetReadingMedicineSystemQuestionList_Export(data) {
+  return requestDownload({
+    url: `/ExcelExport/GetReadingMedicineSystemQuestionList_Export`,
+    responseType: 'blob',
+    method: 'post',
+    data
+  })
+}

src/api/reading.js

@@ -45,10 +45,11 @@ export function saveImageLabelList(param) {
   })
 }
 
-export function getStudyInfo(studyId) {
+export function getStudyInfo(studyId, params) {
   return request({
     url: `/Study/item/${studyId}`,
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 export function getSeriesList(url) {
@@ -285,4 +286,36 @@ export function deleteSingleTableQuestionMark(param, type) {
   })
 }
 
+// 阅片导入
+export function readingImport(param) {
+  return request({
+    url: `/ReadingCalculate/readingImport`,
+    method: 'post',
+    data: param
+  })
+}
 
+// 非dicom阅片保存标记
+export function saveAnswerAndBindingNoneDicomMark(param) {
+  return request({
+    url: `/ReadingImageTask/saveAnswerAndBindingNoneDicomMark`,
+    method: 'post',
+    data: param
+  })
+}
+// 非dicom按比例修改答案
+export function changePlottingScaleChangeAnswer(param) {
+  return request({
+    url: `/ReadingImageTask/changePlottingScaleChangeAnswer`,
+    method: 'post',
+    data: param
+  })
+}
+// 阅片获取图表数据
+export function getReportsChartData(param) {
+  return request({
+    url: `/ReadingImageTask/getReportsChartData`,
+    method: 'post',
+    data: param
+  })
+}

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
+    }
   })
 }
 

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}`,
@@ -3044,7 +3069,13 @@ export function readClinicalData(param) {
     data: param
   })
 }
-
+export function viewstudyPart(param) {
+  return request({
+    url: `/ReadingImageTask/viewstudyPart`,
+    method: 'post',
+    data: param
+  })
+}
 export function getCustomQuestionPreview(param) {
   return request({
     url: `/ReadingQuestion/getCustomQuestionPreview`,
@@ -3597,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}`,
@@ -4130,4 +4172,238 @@ export function addFolder(data) {
     method: 'post',
     data
   })
+}
+
+
+// 配置-项目文档发布
+export function publishTrialDocument(data) {
+  return request({
+    url: `/TrialDocument/publishTrialDocument`,
+    method: 'post',
+    data
+  })
+}
+// 配置-获取项目文档附件列表
+export function getTrialDocumentAttachmentList(data) {
+  return request({
+    url: `/TrialDocument/getTrialDocumentAttachmentList`,
+    method: 'post',
+    data
+  })
+}
+// 配置-新增或修改项目文档附件
+export function addOrUpdateTrialDocumentAttachment(data) {
+  return request({
+    url: `/TrialDocument/addOrUpdateTrialDocumentAttachment`,
+    method: 'post',
+    data
+  })
+}
+// 配置-删除项目文档附件
+export function deleteTrialDocumentAttachment(data) {
+  return request({
+    url: `/TrialDocument/deleteTrialDocumentAttachment/${data}`,
+    method: 'delete',
+  })
+}
+
+// 配置-获取稽查管理列表
+export function getTrialShowInspection(data) {
+  return request({
+    url: `/Inspection/getTrialShowInspection`,
+    method: 'post',
+    data
+  })
+}
+// 配置-设置稽查管理配置
+export function setTrialShowInspection(data) {
+  return request({
+    url: `/Inspection/setTrialShowInspection`,
+    method: 'post',
+    data
+  })
+}
+// 影像汇总-获取列表
+export function getTrialVisitImageStatList(data) {
+  return request({
+    url: `/DownloadAndUpload/getTrialVisitImageStatList`,
+    method: 'post',
+    data
+  })
+}
+// 影像汇总-获取统计
+export function getTrialVisitImageStatInfo(params) {
+  return request({
+    url: `/DownloadAndUpload/getTrialVisitImageStatInfo`,
+    method: 'get',
+    params
+  })
+}
+// 影像汇总-影像下载
+export function getExportSubjectVisitImageList(data) {
+  return request({
+    url: `/DownloadAndUpload/getExportSubjectVisitImageList`,
+    method: 'post',
+    data
+  })
+}
+// 影像质控-更正dicom
+export function updateDicomStudyInfo(data) {
+  return request({
+    url: `/Inspection/QCOperation/UpdateDicomStudyInfo`,
+    method: 'post',
+    data
+  })
+}
+// 影像质控-更正非dicom
+export function updateNoneDicomStudy(data) {
+  return request({
+    url: `/Inspection/NoneDicomStudy/UpdateNoneDicomStudy`,
+    method: 'post',
+    data
+  })
+}
+// 阅片单元-获取访视计划
+export function getVisitStage(data) {
+  return request({
+    url: `/VisitPlan/getVisitStage`,
+    method: 'post',
+    data
+  })
+}
+// 稽查管理-列表
+export function getAuditRecordList(data) {
+  return request({
+    url: `/AuditDocument/getAuditRecordList`,
+    method: 'post',
+    data
+  })
+}
+// 稽查管理-列表(EA)
+export function getAuditRecordSelectList(data) {
+  return request({
+    url: `/AuditDocument/getAuditRecordSelectList`,
+    method: 'post',
+    data
+  })
+}
+// 稽查管理-列表新增修改
+export function addOrUpdateAuditRecord(data) {
+  return request({
+    url: `/AuditDocument/addOrUpdateAuditRecord`,
+    method: 'post',
+    data
+  })
+}
+// 稽查管理-文档授权
+export function setAuditRecordPermission(data) {
+  return request({
+    url: `/AuditDocument/setAuditRecordPermission`,
+    method: 'post',
+    data
+  })
+}
+// 稽查管理-人员管理
+export function addOrDeleteAuditRecordUser(data) {
+  return request({
+    url: `/AuditDocument/addOrDeleteAuditRecordUser`,
+    method: 'put',
+    data
+  })
+}
+// 稽查管理-删除
+export function deleteAuditRecord(auditRecordId) {
+  return request({
+    url: `/AuditDocument/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
+  })
 }

src/api/trials/reading.js

@@ -459,9 +459,9 @@ export function setMedicalReviewInvalid(params) {
   })
 }
 
-export function getTrialCriterionList(trialId) {
+export function getTrialCriterionList(trialId, isRandom = false) {
   return request({
-    url: `/VisitTask/getTrialCriterionList?TrialId=${trialId}`,
+    url: `/VisitTask/getTrialCriterionList?TrialId=${trialId}&isRandom=${isRandom}`,
     method: 'get'
   })
 }
@@ -487,4 +487,4 @@ export function setRandomTaskOrder(data) {
     method: 'post',
     data
   })
-}
+}

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;

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;
+};

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>

src/components/Dicom/DicomCanvas.vue

@@ -1,15 +1,7 @@
 <template>
-  <div
+  <div id="canvas" ref="canvas" v-loading="loading" :element-loading-text="NSTip"
-    id="canvas"
+    element-loading-background="rgba(0, 0, 0, 0.8)" style="width:100%;height:100%;position:relative;"
-    ref="canvas"
+    class="cornerstone-element" @contextmenu.prevent="onContextmenu" @mouseup="sliderMouseup">
-    v-loading="loading"
-    :element-loading-text="NSTip"
-    element-loading-background="rgba(0, 0, 0, 0.8)"
-    style="width:100%;height:100%;position:relative;"
-    class="cornerstone-element"
-    @contextmenu.prevent="onContextmenu"
-    @mouseup="sliderMouseup"
-  >
     <div v-show="dicomInfo.series" class="info-series">
       <div>Series #{{ dicomInfo.series }}</div>
       <div>Image #{{ dicomInfo.frame }}</div>
@@ -26,9 +18,11 @@
       <div v-show="dicomInfo.location">Location {{ dicomInfo.location }}mm</div> -->
       <!-- <div v-show="toolState.clipPlaying">FPS {{ dicomInfo.fps }}</div> -->
       <div v-show="mousePosition.mo">
-        Pos: {{ mousePosition.x?mousePosition.x.toFixed(0):'' }}, {{ mousePosition.y?mousePosition.y.toFixed(0):'' }}
+        Pos: {{ mousePosition.x ? mousePosition.x.toFixed(0) : '' }}, {{ mousePosition.y ? mousePosition.y.toFixed(0) :
+          '' }}
       </div>
-      <div v-if="(dicomInfo.modality === 'CT' || dicomInfo.modality === 'DR' || dicomInfo.modality === 'CR') && mousePosition.mo">
+      <div
+        v-if="(dicomInfo.modality === 'CT' || dicomInfo.modality === 'DR' || dicomInfo.modality === 'CR') && mousePosition.mo">
         HU: {{ mousePosition.mo }}
       </div>
       <div v-else-if="(dicomInfo.modality === 'PT' && mousePosition.suv)">
@@ -45,6 +39,8 @@
     </div>
 
     <div class="info-subject">
+      <div v-if="series.subjectCode">{{ series.subjectCode }}</div>
+      <div v-if="series.visitName">{{ series.visitName }}</div>
       <div>{{ stack.description }}</div>
       <!-- <div>{{ dicomInfo.hospital }}</div> -->
       <!-- <div v-show="dicomInfo.pid">{{ dicomInfo.pid }}</div> -->
@@ -53,8 +49,12 @@
       <!-- <div v-show="dicomInfo.acc">ACC {{ dicomInfo.acc }}</div> -->
       <!-- <div>{{ dicomInfo.time }}</div> -->
     </div>
-    <div ref="sliderBox" class="my_slider_box" style="position: absolute;right: 1px;height: calc(100% - 100px);transform: translateY(-50%);top: calc(50% - 30px);width: 10px;background: #333;cursor: pointer" @click.stop="goViewer($event)">
+    <div ref="sliderBox" class="my_slider_box"
-      <div :style="{top: height + '%'}" style="z-index:10;background: #9e9e9e;height: 20px;width: 100%;position: absolute;top: 0;cursor: move" @mousedown="sliderMousedown($event)" />
+      style="position: absolute;right: 1px;height: calc(100% - 100px);transform: translateY(-50%);top: calc(50% - 30px);width: 10px;background: #333;cursor: pointer"
+      @click.stop="goViewer($event)">
+      <div :style="{ top: height + '%' }"
+        style="z-index:10;background: #9e9e9e;height: 20px;width: 100%;position: absolute;top: 0;cursor: move"
+        @mousedown="sliderMousedown($event)" />
     </div>
     <div style="position: absolute;left: 50%;top: 15px;color: #f44336;">
       {{ markers.top }}
@@ -81,15 +81,8 @@
     <!-- <div v-show="stack.firstImageLoading" class="load-indicator">
       Loading Series #{{ stack.seriesNumber }}...
     </div>-->
-    <el-dialog
+    <el-dialog v-if="dcmTag.visible" :visible.sync="dcmTag.visible" :close-on-click-modal="false" :title="dcmTag.title"
-      v-if="dcmTag.visible"
+      width="1000px" custom-class="base-dialog-wrapper" append-to-body>
-      :visible.sync="dcmTag.visible"
-      :close-on-click-modal="false"
-      :title="dcmTag.title"
-      width="1000px"
-      custom-class="base-dialog-wrapper"
-      append-to-body
-    >
       <dicom-tags :image-id="stack.imageIds[stack.currentImageIdIndex]" @close="dcmTag.visible = false" />
     </el-dialog>
   </div>
@@ -123,7 +116,7 @@ export default {
   components: { DicomTags },
   computed: {
     NSTip() {
-      return `${this.$store.state.trials.uploadSize}, NS: ${this.$store.state.trials.uploadTip}`
+      return `${this.$store.state.trials.downloadSize}, NS: ${this.$store.state.trials.downloadTip}`
     }
   },
   data() {
@@ -268,9 +261,9 @@ export default {
             )
             if (!toolAlreadyAddedToElement) {
               if (toolName === 'RectangleRoi') {
-                cornerstoneTools.addToolForElement(element, apiTool, { configuration: { showMinMax: true, showStatsText: true}})
+                cornerstoneTools.addToolForElement(element, apiTool, { configuration: { showMinMax: true, showStatsText: true } })
               } else if (toolName === 'EllipticalRoi') {
-                cornerstoneTools.addToolForElement(element, apiTool, { configuration: { showMinMax: true}})
+                cornerstoneTools.addToolForElement(element, apiTool, { configuration: { showMinMax: true } })
               } else {
                 cornerstoneTools.addToolForElement(element, apiTool)
               }
@@ -333,7 +326,7 @@ export default {
       // cornerstoneTools.addStackStateManager(this.canvas, ['stack', 'stackPrefetch', 'playClip'])
       cornerstoneTools.addToolState(this.canvas, 'stack', this.stack)
       // cornerstoneTools.stackPrefetch.enable(this.canvas)
-      cornerstone.updateImage(element, true) 
+      cornerstone.updateImage(element, true)
       // cornerstoneTools.stackPrefetch.setConfiguration({ maxImagesToPrefetch: Infinity,
       // preserveExistingPool: true })
       // cornerstoneTools.stackPrefetch.enable(this.canvas)
@@ -373,9 +366,8 @@ export default {
         data.string('x00080030')
       )
       this.dicomInfo.series = data.string('x00200011')
-      this.dicomInfo.frame = `${this.stack.currentImageIdIndex + 1}/${
+      this.dicomInfo.frame = `${this.stack.currentImageIdIndex + 1}/${this.stack.imageIds.length
-        this.stack.imageIds.length
+        }`
-      }`
       this.dicomInfo.size = `${data.uint16('x00280011')}x${data.uint16(
         'x00280010'
       )}`
@@ -393,6 +385,7 @@ export default {
       this.stack.imageIdIndex = newImageIdIndex
       this.series.imageIdIndex = newImageIdIndex
       this.height = (this.stack.currentImageIdIndex) * 100 / (this.stack.imageIds.length - 1)
+      this.resetWwwc()
     },
     stackScrollCallback(e) {
       const { detail } = e
@@ -683,7 +676,7 @@ export default {
       cornerstoneTools.getToolState(
         this.canvas,
         'playClip'
-      ).data[0].loop = false
+      ).data[0].loop = true
     },
     setFps(fps) {
       this.dicomInfo.fps = fps
@@ -1141,6 +1134,7 @@ export default {
   font-size: 12px;
   /* z-index: 1; */
 }
+
 .info-image {
   position: absolute;
   left: 10px;
@@ -1160,6 +1154,7 @@ export default {
   font-size: 12px;
   /* z-index: 1; */
 }
+
 .info-instance {
   position: absolute;
   right: 15px;
@@ -1192,6 +1187,7 @@ export default {
   margin: 10px;
   cursor: default;
 }
+
 .menu__item:hover {
   color: #ff0000;
 }
@@ -1211,7 +1207,8 @@ li:hover {
   background-color: #e0e0e2;
   color: white;
 }
-.my_slider_box:after{
+
+.my_slider_box:after {
   content: '';
   position: absolute;
   bottom: -20px;

src/components/Dicom/DicomViewer.vue

@@ -887,11 +887,11 @@ export default {
 .dicom-wrapper .dropdown-content {
   display: none;
   position: absolute;
-  left: 0;
+  left: -20px;
   top: 40px;
   color: #d0d0d0;
   background-color: #323232;
-  min-width: 80px;
+  min-width: 100px;
   box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
   border: 1px solid #4e4e4e;
   padding: 5px;

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;
 }

src/components/Preview/fun.js

@@ -4,7 +4,7 @@ import Preview from "./index.vue";
 const PreviewConstructor = Vue.extend(Preview);
 
 const preview = options => {
-    const { path, type, title } = options;
+    const { path, type, title, isLocal = false } = options;
     if (!path) throw `path is requred.but ${path}`
     const id = `Preview_${new Date().getTime()}`;
     const instance = new PreviewConstructor();
@@ -12,7 +12,7 @@ const preview = options => {
     instance.vm = instance.$mount();
     if (instance.vm.visible) return;
     document.body.appendChild(instance.vm.$el);
-    instance.vm.open(path, type, title);
+    instance.vm.open(path, type, title, isLocal);
     instance.vm.$on("closed", () => {
         document.body.removeChild(instance.vm.$el);
         instance.vm.$destroy();

src/components/Preview/index.vue

@@ -1,15 +1,8 @@
 <template>
-  <el-dialog
+  <el-dialog v-if="visible" :visible.sync="visible" :title="title" :fullscreen="true" append-to-body
-    v-if="visible"
+    custom-class="base-dialog-wrapper" @close="handleClose">
-    :visible.sync="visible"
-    :title="title"
-    :fullscreen="true"
-    append-to-body
-    custom-class="base-dialog-wrapper"
-    @close="handleClose"
-  >
     <div class="base-modal-body" style="border: 2px solid #ccc; padding: 10px">
-      <PreviewFile v-if="visible" :file-path="path" :file-type="type" />
+      <PreviewFile v-if="visible" :file-path="path" :file-type="type" :is-local="isLocal" />
     </div>
   </el-dialog>
 </template>
@@ -24,13 +17,15 @@ export default {
       path: null,
       type: null,
       title: null,
+      isLocal: false
     };
   },
   methods: {
-    open(path, type, title) {
+    open(path, type, title, isLocal) {
       this.path = path;
       this.type = type;
       this.title = title;
+      this.isLocal = isLocal;
       this.visible = true;
     },
     handleClose() {

src/components/PreviewFile/index.vue

@@ -5,14 +5,17 @@
     <!-- <embed v-else-if="fileType.indexOf('pdf') !== -1" :src="filePath+'#toolbar=0'" style="width: 100%; height: 100%"> -->
     <!-- <iframe v-else-if="fileType.indexOf('pdf') !== -1" :src="filePath+'#toolbar=0'" width="100%" height="100%" frameborder="0" /> -->
     <iframe v-else-if="fileType.indexOf('pdf') !== -1"
-      :src="`/static/pdfjs/web/viewer.html?file=${OSSclientConfig.basePath}${filePath}?userName=${currentUser}&COMPANY=${COMPANY}`"
+      :src="`/static/pdfjs/web/viewer.html?file=${isLocal ? window.location.origin : OSSclientConfig.basePath}${filePath}?userName=${currentUser}&COMPANY=${COMPANY}`"
       width="100%" height="100%" frameborder="0" crossorigin="anonymous" />
     <!--    <pdf-->
     <!--      v-else-if="fileType.indexOf('pdf') !== -1"-->
     <!--      :src="`/static/pdfjs/web/viewer.html?file=${filePath}`">-->
     <!--    </pdf>-->
+    <video :src="`${isLocal ? window.location.origin : OSSclientConfig.basePath}${filePath}`"
+      style="width: 100%;height: 99%;" autoplay controls controlsList="nodownload"
+      v-else-if="fileType.indexOf('mp4') !== -1"></video>
     <iframe v-else
-      :src="`/static/onlyOffice/viewer.html?url=${OSSclientConfig.basePath}${filePath}?onlyOffice_url=${onlyOffice_url}&type=${fileType}&title=${title}&documentType=${documentType}&userName=${currentUser}`"
+      :src="`/static/onlyOffice/viewer.html?url=${isLocal ? window.location.origin : OSSclientConfig.basePath}${filePath}?onlyOffice_url=${onlyOffice_url}&type=${fileType}&title=${title}&documentType=${documentType}&userName=${currentUser}`"
       width="100%" height="100%" frameborder="0" crossorigin="anonymous" />
     <!-- <div v-else>
       {{ $t('common:message:downloadFile') }}
@@ -41,17 +44,21 @@ export default {
       type: String,
       default: ''
     },
+    isLocal: {
+      type: Boolean,
+      default: false
+    }
   },
   data() {
     return {
       currentUser: zzSessionStorage.getItem('userName'),
       COMPANY: process.env.VUE_APP_COMPANY_NAME,
-      onlyOffice_url: process.env.VUE_APP_ONLYOFFICE_URL
+      onlyOffice_url: process.env.VUE_APP_ONLYOFFICE_URL,
+      window,
     }
   },
   computed: {
     documentType() {
-      console.log(DOCUMENTTYPE[`.${this.fileType}`], 'documentType')
       return DOCUMENTTYPE[`.${this.fileType}`]
     }
   },

src/components/Preview_video/fun.js

@@ -0,0 +1,23 @@
+import Vue from "vue";
+import Video from "./index.vue";
+
+const PreviewConstructor = Vue.extend(Video);
+
+const video = options => {
+    const { path, type, title } = options;
+    if (!path) throw `path is requred.but ${path}`
+    const id = `OnlyOffice_${new Date().getTime()}`;
+    const instance = new PreviewConstructor();
+    instance.id = id;
+    instance.vm = instance.$mount();
+    if (instance.vm.visible) return;
+    document.body.appendChild(instance.vm.$el);
+    instance.vm.open(path, type, title);
+    instance.vm.$on("closed", () => {
+        instance.vm.docEditor = null
+        document.body.removeChild(instance.vm.$el);
+        instance.vm.$destroy();
+    });
+    return instance.vm;
+}
+export default video;

src/components/Preview_video/index.js

@@ -0,0 +1,7 @@
+import Video from "./index.vue";
+import video from "./fun";
+
+export default Vue => {
+    Vue.component(Video.name, Video);
+    Vue.prototype.$video = video;
+};

src/components/Preview_video/index.vue

@@ -0,0 +1,38 @@
+<template>
+  <el-dialog v-if="visible" :visible.sync="visible" :title="title" :fullscreen="true" append-to-body
+    custom-class="base-dialog-wrapper" @close="handleClose">
+    <div class="base-modal-body" style="border: 2px solid #ccc; padding: 10px">
+      <video :src="path" style="width: 100%;height: 99%;" autoplay controls controlsList="nodownload"></video>
+    </div>
+  </el-dialog>
+</template>
+<script>
+export default {
+  name: "Video",
+  data() {
+    return {
+      visible: false,
+      path: null,
+      type: null,
+      title: null,
+    };
+  },
+  methods: {
+
+    open(path, type, title) {
+      this.path = this.OSSclientConfig.basePath + path;
+      this.title = title;
+      this.visible = true;
+    },
+    handleClose() {
+      this.$emit("closed");
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+#placeholder {
+  width: 100%;
+  height: 100%;
+}
+</style>

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)
       }
     }

src/components/clinicalDataQuestions/components/QuestionFormItem.vue

@@ -22,7 +22,13 @@
       </div>
       <el-table :data="questionForm[question.Id]">
         <el-table-column v-for="item of question.TableQuestions" :key="item.Id" :prop="item.Id"
-          :label="item.QuestionName" min-width="100" show-overflow-tooltip />
+          :label="item.QuestionName" min-width="100" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row[item.Id] && Array.isArray(scope.row[item.Id]) ?
+              scope.row[item.Id].join(" | ")
+              : scope.row[item.Id] }}
+          </template>
+        </el-table-column>
         <el-table-column :label="$t('common:action:action')" min-width="100" show-overflow-tooltip
           v-if="SecondReviewState <= 0">
           <template slot-scope="scope">
@@ -76,7 +82,7 @@
             <el-option v-for="val in question.TypeValue.split('|')" :key="val" :label="val" :value="val.trim()" />
           </template>
         </el-select>
-        <!-- 单选 -->
+        <!-- 日期 -->
         <el-date-picker v-if="question.ClinicalQuestionType === 'time'" v-model="questionForm[question.Id]"
           style="width: 200px" align="right" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd" />
         <!-- 单选 -->
@@ -317,8 +323,6 @@ export default {
                   })
                   break
                 case 6:
-                  console.log(this.questionForm[o.QuestionId])
-                  console.log(this.questionForm)
                   this.questionForm[o.QuestionId].forEach((q, qi) => {
                     if (qi === 0) {
                       num = parseFloat(q[o.TableQuestionId])
@@ -361,11 +365,16 @@ export default {
                   }
                   break
                 case 11:
-                  if (parseFloat(this.getCurrentAgeByBirthDate2(this.questionForm[o.TableQuestionId], this.questionForm[o.QuestionId])) > 0) {
+                  if (parseFloat(this.getCurrentAgeByBirthDate(this.questionForm[o.TableQuestionId])) > 0) {
-                    num = parseFloat(this.getCurrentAgeByBirthDate2(this.questionForm[o.TableQuestionId], this.questionForm[o.QuestionId]))
+                    num = parseFloat(this.getCurrentAgeByBirthDate(this.questionForm[o.TableQuestionId]))
                   } else {
                     num = 0
                   }
+                  // if (parseFloat(this.getCurrentAgeByBirthDate2(this.questionForm[o.TableQuestionId], this.questionForm[o.QuestionId])) > 0) {
+                  //   num = parseFloat(this.getCurrentAgeByBirthDate2(this.questionForm[o.TableQuestionId], this.questionForm[o.QuestionId]))
+                  // } else {
+                  //   num = 0
+                  // }
                   break
               }
             } else {
@@ -405,19 +414,19 @@ export default {
       } catch (e) {
         console.log(e)
       }
-      console.log(num)
+      if (rules.DigitPlaces) {
+        num = num.toFixed(rules.DigitPlaces)
+      }
       return num
     },
     formItemNumberChange(questionId, isTable) {
       try {
         if (isTable) {
           this.calculationList.forEach((v, i) => {
-            console.log(v, i)
             var find = v.CalculateQuestionList.filter(o => {
               return o.QuestionId === questionId
             })
             // find的自动计算值number
-            console.log('find', find)
             if (find) {
               var num = this.logic(v)
               if (num !== false) {
@@ -431,7 +440,6 @@ export default {
               return o.TableQuestionId === questionId
             })
             // find的自动计算值number
-            console.log('find', find)
             // find的自动计算值number
             if (find) {
               var num = this.logic(v)
@@ -502,6 +510,9 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+::v-deep .el-form-item__label{
+  color: #606266 !important;
+}
 .my_dialog {
   .criterion-form-item {
     ::v-deep .el-form-item__content {

src/components/clinicalDataQuestions/components/QuestionTableFormItem.vue

@@ -1,125 +1,65 @@
 <template>
   <div class="criterion-form-item">
 
-    <el-form-item
+    <el-form-item :label="`${question.QuestionName}`" :prop="question.Id" :rules="[
-      :label="`${question.QuestionName}`"
+      {
-      :prop="question.Id"
+        required: (question.IsRequired === 0 || (question.IsRequired === 1 && question.RelevanceId && !!~question.RelevanceValueList.indexOf(questionForm[question.RelevanceId]))),
-      :rules="[
+        message: $t('common:ruleMessage:specify'), trigger: ['blur'],
-        { required: (question.IsRequired === 0 || (question.IsRequired ===1 && question.RelevanceId && !!~question.RelevanceValueList.indexOf(questionForm[question.RelevanceId]))),
+        type: question.ClinicalTableQuestionType === 'checkbox' ? 'array' : ''
-          message: $t('common:ruleMessage:specify'), trigger: ['blur'],
+      },
-          type: question.ClinicalTableQuestionType === 'checkbox' ? 'array' : ''},
+    ]"
-      ]"
+      :class="[question.ClinicalTableQuestionType === 'group' ? 'mb' : question.ClinicalTableQuestionType === 'upload' ? 'uploadWrapper' : '']">
-      :class="[question.ClinicalTableQuestionType==='group'?'mb':question.ClinicalTableQuestionType==='upload'?'uploadWrapper':'']"
+      <el-input v-if="question.ClinicalTableQuestionType === 'input'" v-model="questionForm[question.Id]"
-    >
+        :max-length="200" :disabled="question.TableQuestionType === 2" />
-      <el-input
-        v-if="question.ClinicalTableQuestionType==='input'"
-        v-model="questionForm[question.Id]"
-        :max-length="200"
-        :disabled="question.TableQuestionType === 2"
-      />
       <!-- 多行文本输入框 -->
-      <el-input
+      <el-input v-if="question.ClinicalTableQuestionType === 'textarea'" v-model="questionForm[question.Id]"
-        v-if="question.ClinicalTableQuestionType==='textarea'"
+        :max-length="200" type="textarea" :autosize="{ minRows: 2, maxRows: 4 }" />
-        v-model="questionForm[question.Id]"
-        :max-length="200"
-        type="textarea"
-        :autosize="{ minRows: 2, maxRows: 4}"
-      />
       <!-- 下拉框 -->
-      <el-select
+      <el-select v-if="question.ClinicalTableQuestionType === 'select'" v-model="questionForm[question.Id]" clearable
-        v-if="question.ClinicalTableQuestionType==='select'"
+        :disabled="(question.TableQuestionType === 2 || question.QuestionGenre === 2) && !!question.DictionaryCode">
-        v-model="questionForm[question.Id]"
-        clearable
-        :disabled="(question.TableQuestionType === 2 || question.QuestionGenre === 2) && !!question.DictionaryCode"
-      >
         <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="item.value"
-            v-for="item of $d[question.DictionaryCode]"
+            :label="item.label" />
-            :key="item.id"
-            :value="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="item.value"
-            :key="item.id"
+            :label="item.label" />
-            :value="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-date-picker
+      <el-date-picker v-if="question.ClinicalTableQuestionType === 'time'" v-model="questionForm[question.Id]"
-        v-if="question.ClinicalTableQuestionType === 'time'"
+        format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px" align="right" type="date" />
-        v-model="questionForm[question.Id]"
-        format="yyyy-MM-dd"
-        value-format="yyyy-MM-dd"
-        style="width: 200px"
-        align="right"
-        type="date"
-      />
       <!-- 单选 -->
-      <el-radio-group
+      <el-radio-group v-if="question.ClinicalTableQuestionType === 'radio'" v-model="questionForm[question.Id]"
-        v-if="question.ClinicalTableQuestionType==='radio'"
+        @change="((val) => { formItemChange(val, question) })">
-        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="item.value">
-            v-for="item of $d[question.DictionaryCode]"
-            :key="item.id"
-            :label="item.value"
-          >
             {{ item.label }}
           </el-radio>
         </template>
         <template v-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-if="question.ClinicalTableQuestionType === 'checkbox'" v-model="questionForm[question.Id]">
-        v-if="question.ClinicalTableQuestionType==='checkbox'"
+        <el-checkbox v-for="val in question.TypeValue.split('|')" :key="val" :label="val">
-        v-model="questionForm[question.Id]"
-      >
-        <el-checkbox
-          v-for="val in question.TypeValue.split('|')"
-          :key="val"
-          :label="val"
-        >
           {{ val }}
         </el-checkbox>
       </el-checkbox-group>
-      <el-input
+      <el-input v-if="question.ClinicalTableQuestionType === 'number'" v-model="questionForm[question.Id]" type="number"
-        v-if="question.ClinicalTableQuestionType === 'number'"
+        @input="limitInput($event, questionForm, question)" style="width: 200px">
-        v-model="questionForm[question.Id]"
-        type="number"
-        style="width: 200px"
-      >
         <template v-if="question.Unit" slot="append">{{ question.Unit }}</template>
       </el-input>
     </el-form-item>
@@ -187,6 +127,14 @@ export default {
     }
   },
   methods: {
+    limitInput(value, form, row) {
+      if (value.indexOf('.') > -1) {
+        if (value.split('.')[1].length >= row.DigitPlaces) {
+          this.$set(form, row.Id, parseFloat(value).toFixed(row.DigitPlaces))
+        }
+      }
+      this.$forceUpdate()
+    },
     save() {
     },
     openAddTableCol(row) {
@@ -220,34 +168,40 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.my_dialog{
+.my_dialog {
-  .criterion-form-item{
+  .criterion-form-item {
-    ::v-deep .el-form-item__content{
+    ::v-deep .el-form-item__content {
       width: auto;
     }
   }
 }
-.criterion-form-item{
+
-  .el-form-item{
+.criterion-form-item {
+  .el-form-item {
     display: flex;
     flex-direction: row;
     align-items: flex-start;
   }
-  ::v-deep .el-form-item__content{
+
+  ::v-deep .el-form-item__content {
     width: 500px;
   }
-  .el-input{
+
-    width:100%;
+  .el-input {
+    width: 100%;
   }
-  .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;

src/components/clinicalDataQuestions/components/QuestionsForm.vue

@@ -375,7 +375,7 @@ export default {
           console.log(i.Answer ? i.Answer.split(',') : [])
           console.log(this.questionForm)
         } else if (i.ClinicalQuestionType === 'number') {
-          this.$set(this.questionForm, i.Id, i.Answer)
+          this.$set(this.questionForm, i.Id, i.Answer || i.DefaultValue)
         } else if (i.Childrens && i.Childrens.length > 0) {
           this.setChild(i.Childrens)
         }

src/components/downloadDicomAndNonedicom/index.vue

@@ -22,10 +22,9 @@
       <i class="el-icon-warning-outline"></i>
       <div v-html="$t('download:tip:message')"></div>
     </div>
-    <!--上传列表@selection-change="handleSelectionChange"-->
+    <!--上传列表@selection-change="handleSelectionChange" @sort-change="handleSortByColumn"-->
     <el-table ref="dicomFilesTable" v-adaptive="{ bottomOffset: 85 }" height="100" :data="list" :loading="loading"
-      class="dicomFiles-table" 
+      class="dicomFiles-table" :default-sort="{ prop: 'TaskBlindName', order: 'descending' }">
-      :default-sort="{ prop: 'TaskBlindName', order: 'descending' }">
       <!-- <el-table-column
         type="selection"
         width="55"
@@ -150,13 +149,13 @@ export default {
       open: null,
       downloadId: null,
       IsReadingTaskViewInOrder: 0, // 阅片规则
-      bodyPart: [],
+      bodyPart: {},
       modelTaskId: null,
     }
   },
   async mounted() {
+    this.bodyPart.Bodypart = await this.$getBodyPart(this.$route.query.trialId)
     this.getList()
-    this.bodyPart = await this.$getBodyPart(this.$route.query.trialId)
     this.title = `Download Images：${this.SubjectCode}（${this.Criterion.TrialReadingCriterionName}）`
   },
   beforeDestroy() {
@@ -298,24 +297,47 @@ export default {
         if (data.StudyList && data.StudyList.length > 0) {
           let StudyList = data.StudyList
           StudyList.forEach((study) => {
+            if (study.StudyDIRPath) {
+              let obj = {
+                name: `${data.SubjectCode}/${data.TaskBlindName
+                  }/${this.$fd('IsDicom', true)}/${study.StudyCode
+                  }/DICOMDIR`,
+                url: this.OSSclientConfig.basePath + study.StudyDIRPath,
+              }
+              if (this.IsReadingTaskViewInOrder === 0) {
+                obj = {
+                  name: `${data.TaskBlindName}/${this.$fd(
+                    'IsDicom',
+                    true
+                  )}/DICOMDIR`,
+                  url: this.OSSclientConfig.basePath + study.StudyDIRPath,
+                }
+              }
+              files.push(obj)
+            }
             if (study.SeriesList.length > 0) {
               study.SeriesList.forEach((series) => {
-                if (series.InstancePathList.length > 0) {
+                if (series.InstanceList.length > 0) {
-                  series.InstancePathList.forEach((instance) => {
+                  series.InstanceList.forEach((instance) => {
                     let fileName = instance.Path.split('/').pop()
+                    if (instance.FileName) {
+                      fileName = instance.FileName
+                    }
                     let obj = {
                       name: `${data.SubjectCode}/${data.TaskBlindName
                         }/${this.$fd('IsDicom', true)}/${study.StudyCode
-                        }/${fileName}`,
+                        }/IMAGE/${fileName}`,
                       url: this.OSSclientConfig.basePath + instance.Path,
+                      IsEncapsulated: instance.IsEncapsulated
                     }
                     if (this.IsReadingTaskViewInOrder === 0) {
                       obj = {
                         name: `${data.TaskBlindName}/${this.$fd(
                           'IsDicom',
                           true
-                        )}/${fileName}`,
+                        )}/IMAGE/${fileName}`,
                         url: this.OSSclientConfig.basePath + instance.Path,
+                        IsEncapsulated: instance.IsEncapsulated
                       }
                     }
                     files.push(obj)

src/components/feedBack/index.vue

@@ -283,6 +283,7 @@ export default {
         }
         if (this.visitTaskId) {
           this.form.VisitTaskId = this.visitTaskId
+          this.form.QuestionType = 6
         }
         if (this.SubjectVisitId) {
           this.form.SubjectVisitId = this.SubjectVisitId

src/components/readingChart/index.vue

@@ -0,0 +1,240 @@
+<template>
+    <div :id="key" class="readingChart" v-show="visible" :style="{
+        'z-index': zIndex
+    }">
+        <div ref="chartContainer" style="width: 490px; height: 290px;" v-loading="loading"></div>
+    </div>
+</template>
+
+<script>
+import { getReportsChartData } from "@/api/reading"
+import moment from "moment"
+let echarts = require('echarts/lib/echarts');
+
+// 按需引入图表
+// require('echarts/lib/chart/bar');
+require('echarts/lib/chart/line');
+// require('echarts/lib/chart/pie');
+// require('echarts/lib/chart/scatter');
+
+// 按需引入组件
+require('echarts/lib/component/tooltip');
+require('echarts/lib/component/title');
+require('echarts/lib/component/legend');
+require('echarts/lib/component/grid');
+require('echarts/lib/component/dataZoom');
+export default {
+    name: "readingChart",
+    props: {
+
+    },
+    data() {
+        return {
+            visible: false,
+            zIndex: 9,
+            chart: null,
+            loading: false,
+            key: 'readingChart'
+        };
+    },
+    methods: {
+        init(event, obj, zIndex = 9) {
+            this.loading = true
+            this.zIndex = zIndex
+            let { key } = obj
+            if (key) {
+                this.key = key
+            }
+            this.$nextTick(() => {
+                this.visible = true
+                let readingChart = document.querySelector(`#${this.key}`);
+                let chaY = document.body.clientHeight - event.clientY;
+                let chaX = document.body.clientWidth - event.clientX;
+                if (chaY < 250) {
+                    readingChart.style.top = event.clientY - 220 + "px";
+                } else {
+                    readingChart.style.top = event.clientY + "px";
+                }
+                if (chaX < 500) {
+                    readingChart.style.left = event.clientX - 520 + "px";
+                } else {
+                    readingChart.style.left = event.clientX + 15 + "px";
+                }
+                this.getInfo(obj)
+            })
+        },
+        async getInfo(data) {
+            try {
+                let { VisitTaskId = null, TrialId = null, QuestionId = null, QuestionName = null, TableQuestionId = null, RowIndex = null, ReportChartTypeEnum = null } = data
+                let params = {
+                    VisitTaskId, TrialId, QuestionId, TableQuestionId, RowIndex, ReportChartTypeEnum
+                }
+                this.loading = true
+                let res = await getReportsChartData(params)
+                this.loading = false
+                if (res.IsSuccess) {
+                    let LatestScanDateList = res.Result.LatestScanDateList.map(item => item.split(" ")[0])
+                    let obj = {
+                        title: QuestionName,
+                        xAxisData: LatestScanDateList || [],
+                        series: [],
+                        unit: this.$fd("ValueUnit", res.Result.Unit),
+                        visitName: res.Result.VisitTaskNameList,
+                        min: null,
+                        max: null
+                    }
+                    res.Result.ChartDataList.forEach((item) => {
+                        let arr = []
+                        item.Value.forEach((d, index) => {
+                            // arr.push([LatestScanDateList[index], d])
+                            arr.push(d)
+                        })
+                        obj.series.push({
+                            name: item.Name,
+                            data: arr,
+                            type: 'line'
+                        })
+                    });
+                    // if (Array.isArray(res.Result.LatestScanDateList) && res.Result.LatestScanDateList.length >= 2) {
+                    //     let hours = moment(res.Result.LatestScanDateList[res.Result.LatestScanDateList.length - 1]).diff(moment(res.Result.LatestScanDateList[0]), 'hours');
+                    //     let days = moment(res.Result.LatestScanDateList[res.Result.LatestScanDateList.length - 1]).diff(moment(res.Result.LatestScanDateList[0]), 'days');
+                    //     let months = moment(res.Result.LatestScanDateList[res.Result.LatestScanDateList.length - 1]).diff(moment(res.Result.LatestScanDateList[0]), 'months');
+                    //     console.log(hours, 'hours')
+                    //     console.log(days, 'days')
+                    //     console.log(months, 'months')
+                    //     if (hours < 24) {
+                    //         obj.min = moment(res.Result.LatestScanDateList[0]).format('YYYY-MM-DD') + ' 00:00:00'
+                    //         obj.max = moment(res.Result.LatestScanDateList[0]).format('YYYY-MM-DD') + ' 23:59:59'
+                    //     }
+                    //     if (days >= 1 && days <= 7) {
+                    //         obj.min = moment(res.Result.LatestScanDateList[0]).format('YYYY-MM-DD') + ' 00:00:00'
+                    //         obj.max = moment(res.Result.LatestScanDateList[0]).add(7, 'days').format('YYYY-MM-DD') + ' 23:59:59'
+                    //     }
+                    //     if (days > 7 && days < 30) {
+                    //         obj.min = moment(res.Result.LatestScanDateList[0]).startOf('month').format('YYYY-MM-DD') + ' 00:00:00'
+                    //         obj.max = moment(res.Result.LatestScanDateList[0]).endOf('month').format('YYYY-MM-DD') + ' 23:59:59'
+                    //     }
+                    //     if (months >= 1 && months <= 3) {
+                    //         obj.min = moment(res.Result.LatestScanDateList[0]).startOf('month').format('YYYY-MM-DD') + ' 00:00:00'
+                    //         obj.max = moment(res.Result.LatestScanDateList[0]).add(4, 'months').startOf('month').format('YYYY-MM-DD') + ' 23:59:59'
+                    //     }
+                    //     if (months > 3 && months <= 6) {
+                    //         obj.min = moment(res.Result.LatestScanDateList[0]).startOf('month').format('YYYY-MM-DD') + ' 00:00:00'
+                    //         obj.max = moment(res.Result.LatestScanDateList[0]).add(7, 'months').startOf('month').format('YYYY-MM-DD') + ' 23:59:59'
+                    //     }
+                    //     if (months > 6 && months <= 12) {
+                    //         obj.min = moment(res.Result.LatestScanDateList[0]).startOf('month').format('YYYY-MM-DD') + ' 00:00:00'
+                    //         obj.max = moment(res.Result.LatestScanDateList[0]).add(13, 'months').startOf('month').format('YYYY-MM-DD') + ' 23:59:59'
+                    //     }
+                    //     if (months > 12) {
+                    //         obj.min = moment(res.Result.LatestScanDateList[0]).startOf('month').format('YYYY-MM-DD') + ' 00:00:00'
+                    //         obj.max = moment(res.Result.LatestScanDateList[res.Result.LatestScanDateList.length - 1]).add(1, 'months').startOf('month').format('YYYY-MM-DD') + ' 23:59:59'
+                    //     }
+                    // }
+                    // console.log(obj)
+                    this.initChart(obj)
+                }
+            } catch (err) {
+                this.loading = false
+                console.log(err)
+            }
+        },
+        foo() {
+            this.visible = false
+            this.$emit("foo");
+            this.dispose()
+        },
+        initChart(obj) {
+            this.chart = echarts.init(this.$refs.chartContainer);
+            // ...图表配置
+            const option = {
+                title: {
+                    text: obj.title,
+                    textStyle: {
+                        color: "#fff"
+                    }
+                },
+                tooltip: {
+                    trigger: 'axis',
+                    // formatter: function (params) {
+                    //     let index = obj.xAxisData.findIndex(item => item === params[0].value[0])
+                    //     let result = obj.visitName[index] + ' ' + params[0].value[0] + '<br>'; // 显示类目名（如日期）
+                    //     params.forEach(function (item) {
+                    //         result += item.marker + ' ' + item.seriesName + ': ' + item.value[1] + '<br>'; // 显示每个系列的图例、系列名和值
+                    //     });
+                    //     return result;
+                    // }
+                },
+                xAxis: {
+                    // type: 'time',
+                    // data: obj.xAxisData,
+                    data: obj.visitName,
+                    axisLine: { // 设置 x 轴线颜色
+                        lineStyle: {
+                            color: '#fff',
+                        }
+                    },
+                    axisLabel: { // 设置 x 轴文字颜色
+                        textStyle: {
+                            color: '#fff'
+                        }
+                    },
+                    // splitLine: {
+                    //     show: false // 隐藏网格线
+                    // },
+                    // min: obj.min,
+                    // max: obj.max
+                },
+                yAxis: {
+                    name: obj.unit,
+                    type: 'value',
+                    axisLabel: {
+                        textStyle: {
+                            color: '#fff',
+                        }
+                    },
+                    axisLine: {
+                        lineStyle: {
+                            color: '#fff',
+                        }
+                    },
+                },
+                series: obj.series
+            };
+            // 4. 使用配置项渲染图表
+            this.chart.setOption(option);
+        },
+        resize() {
+            if (this.chart) {
+                this.chart.resize()
+            }
+        },
+        dispose() {
+            if (this.chart) {
+                this.chart.dispose()
+                this.chart = null
+            }
+        }
+    },
+};
+</script>
+
+<style lang="scss" scoped>
+.readingChart {
+    min-width: 500px;
+    max-width: 500px;
+    font-size: 14px;
+    display: inline-block;
+    background: #000;
+    border: 1px solid #ebeef5;
+    border-radius: 4px;
+    position: fixed;
+    padding: 10px 6px;
+    list-style-type: none;
+    min-height: 300px;
+    max-height: 80vh;
+    // overflow: hidden;
+    // overflow-y: auto;
+    box-sizing: border-box;
+}
+</style>

src/components/uploadDicomAndNonedicom/dicomFile.vue

@@ -4,123 +4,63 @@
       <span>{{ $t('upload:dicom:title') }}</span>
       <div class="tip">
         <i class="el-icon-warning-outline"></i>
-        <div
+        <div v-html="$t(`upload:dicom:tip:message${isReadingTaskViewInOrder}`)"></div>
-          v-html="$t(`upload:dicom:tip:message${isReadingTaskViewInOrder}`)"
-        ></div>
       </div>
     </div>
     <!--检查列表-->
     <el-table :data="list" style="width: 100%" height="300" :loading="loading">
       <!--受试者-->
-      <el-table-column
+      <el-table-column prop="SubjectCode" :label="$t('upload:dicom:table:subjectCode')" />
-        prop="SubjectCode"
-        :label="$t('upload:dicom:table:subjectCode')"
-      />
       <!--任务名称-->
-      <el-table-column
+      <el-table-column prop="TaskBlindName" :label="$t('upload:dicom:table:taskBlindName')" />
-        prop="TaskBlindName"
-        :label="$t('upload:dicom:table:taskBlindName')"
-      />
       <!--原始检查数-->
-      <el-table-column
+      <el-table-column prop="OrginalStudyList" :label="$t('upload:dicom:table:orginalStudyListNum')">
-        prop="OrginalStudyList"
-        :label="$t('upload:dicom:table:orginalStudyListNum')"
-      >
         <template slot-scope="scope">
-          <el-button
+          <el-button v-if="
-            v-if="
+            scope.row.OrginalStudyList &&
-              scope.row.OrginalStudyList &&
+            scope.row.OrginalStudyList.length >= 1
-              scope.row.OrginalStudyList.length >= 1
+          " type="text" @click="handleOpenDialog(scope.row, 'OrginalStudyList')">
-            "
-            type="text"
-            @click="handleOpenDialog(scope.row, 'OrginalStudyList')"
-          >
             <span>{{ scope.row.OrginalStudyList.length }}</span>
           </el-button>
           <span v-else>0</span>
         </template>
       </el-table-column>
       <!--后处理检查数-->
-      <el-table-column
+      <el-table-column prop="UploadStudyList" :label="$t('upload:dicom:table:uploadStudyListNum')">
-        prop="UploadStudyList"
-        :label="$t('upload:dicom:table:uploadStudyListNum')"
-      >
         <template slot-scope="scope">
-          <el-button
+          <el-button v-if="
-            v-if="
+            scope.row.UploadStudyList && scope.row.UploadStudyList.length >= 1
-              scope.row.UploadStudyList && scope.row.UploadStudyList.length >= 1
+          " type="text" @click="handleOpenDialog(scope.row, 'UploadStudyList', true)">
-            "
-            type="text"
-            @click="handleOpenDialog(scope.row, 'UploadStudyList', true)"
-          >
             <span>{{ scope.row.UploadStudyList.length }}</span>
           </el-button>
           <span v-else>0</span>
         </template>
       </el-table-column>
-      <el-table-column
+      <el-table-column :label="$t('common:action:action')" fixed="right" width="180">
-        :label="$t('common:action:action')"
-        fixed="right"
-        width="180"
-      >
         <template slot-scope="scope">
           <div class="btnBox">
             <!--上传--->
-            <form
+            <form id="inputForm" :ref="`uploadForm_${scope.row.Id}`" enctype="multipart/form-data">
-              id="inputForm"
-              :ref="`uploadForm_${scope.row.Id}`"
-              enctype="multipart/form-data"
-            >
               <div class="form-group" style="margin-right: 10px">
-                <div
+                <div :id="`directoryInputWrapper_${scope.row.Id}`" class="btn btn-link file-input">
-                  :id="`directoryInputWrapper_${scope.row.Id}`"
+                  <el-button circle icon="el-icon-upload2" :disabled="btnLoading" :loading="btnLoading"
-                  class="btn btn-link file-input"
+                    :title="$t('upload:dicom:button:upload')" />
-                >
+                  <input :title="$t('upload:dicom:button:upload')" type="file" :name="`file_${scope.row.VisitTaskId}`"
-                  <el-button
+                    :ref="`pathClear_${scope.row.VisitTaskId}`" :disabled="btnLoading" webkitdirectory multiple @change="
-                    circle
-                    icon="el-icon-upload2"
-                    :disabled="btnLoading"
-                    :loading="btnLoading"
-                    :title="$t('upload:dicom:button:upload')"
-                  />
-                  <input
-                    :title="$t('upload:dicom:button:upload')"
-                    type="file"
-                    :name="`file_${scope.row.VisitTaskId}`"
-                    :ref="`pathClear_${scope.row.VisitTaskId}`"
-                    :disabled="btnLoading"
-                    webkitdirectory
-                    multiple
-                    @change="
                       ($event) => beginScanFiles($event, scope.row.VisitTaskId)
-                    "
+                    " />
-                  />
                 </div>
               </div>
             </form>
             <!--预览--->
-            <el-button
+            <el-button circle icon="el-icon-view" :disabled="!scope.row.UploadStudyList ||
-              circle
+              scope.row.UploadStudyList.length <= 0
-              icon="el-icon-view"
+              " @click.stop="handleViewReadingImages(scope.row)" :title="$t('upload:dicom:button:preview')" />
-              :disabled="
-                !scope.row.UploadStudyList ||
-                scope.row.UploadStudyList.length <= 0
-              "
-              @click.stop="handleViewReadingImages(scope.row)"
-              :title="$t('upload:dicom:button:preview')"
-            />
             <!--删除--->
-            <el-button
+            <el-button circle :disabled="!scope.row.UploadStudyList ||
-              circle
+              scope.row.UploadStudyList.length <= 0 ||
-              :disabled="
+              scope.row.ReadingTaskState === 2
-                !scope.row.UploadStudyList ||
+              " icon="el-icon-delete" :title="$t('upload:dicom:button:delete')" @click.stop="remove(scope.row)" />
-                scope.row.UploadStudyList.length <= 0 ||
-                scope.row.ReadingTaskState === 2
-              "
-              icon="el-icon-delete"
-              :title="$t('upload:dicom:button:delete')"
-              @click.stop="remove(scope.row)"
-            />
           </div>
         </template>
       </el-table-column>
@@ -134,38 +74,19 @@
         <form id="inputForm" ref="uploadForm" enctype="multipart/form-data">
           <div class="form-group">
             <div id="directoryInputWrapper" class="btn btn-link file-input">
-              <el-button
+              <el-button type="primary" :disabled="btnLoading" :loading="btnLoading" size="mini">
-                type="primary"
-                :disabled="btnLoading"
-                :loading="btnLoading"
-                size="mini"
-              >
                 {{ $t('upload:dicom:button:batchUpload') }}
               </el-button>
-              <input
+              <input type="file" name="file" ref="pathClear" :disabled="btnLoading" webkitdirectory multiple title=""
-                type="file"
+                @change="beginScanFiles($event)" />
-                name="file"
-                ref="pathClear"
-                :disabled="btnLoading"
-                webkitdirectory
-                multiple
-                title=""
-                @change="beginScanFiles($event)"
-              />
             </div>
           </div>
         </form>
       </div>
     </div>
     <!--上传列表-->
-    <el-table
+    <el-table ref="dicomFilesTable" v-adaptive="{ bottomOffset: 80 }" height="100" :data="uploadQueues"
-      ref="dicomFilesTable"
+      class="dicomFiles-table" @selection-change="handleSelectionChange">
-      v-adaptive="{ bottomOffset: 80 }"
-      height="100"
-      :data="uploadQueues"
-      class="dicomFiles-table"
-      @selection-change="handleSelectionChange"
-    >
       <el-table-column type="index" width="40" />
       <el-table-column min-width="200" show-overflow-tooltip>
         <template slot="header">
@@ -182,28 +103,21 @@
           <div style="line-height: 15px">
             <div>
               <div>
-                <span v-if="scope.row.dicomInfo.accNumber"
+                <span v-if="scope.row.dicomInfo.accNumber"><span style="font-weight: 500">Acc:</span>
-                  ><span style="font-weight: 500">Acc:</span>
+                  {{ scope.row.dicomInfo.accNumber }}</span>
-                  {{ scope.row.dicomInfo.accNumber }}</span
-                >
                 <span v-else style="color: #f44336">N/A</span>
               </div>
               <div style="display: inline-block; margin-right: 2px">
                 <span v-if="scope.row.dicomInfo.modality.length > 0">
-                  {{ scope.row.dicomInfo.modality.join('、') }},</span
+                  {{ scope.row.dicomInfo.modality.join('、') }},</span>
-                >
                 <span v-else style="color: #f44336">N/A,</span>
               </div>
               <div style="display: inline-block; margin-right: 2px">
-                <span v-if="scope.row.seriesList.length"
+                <span v-if="scope.row.seriesList.length">{{ scope.row.seriesList.length }} Series,</span>
-                  >{{ scope.row.seriesList.length }} Series,</span
-                >
                 <span v-else style="color: #f44336">N/A,</span>
               </div>
               <div style="display: inline-block">
-                <span v-if="scope.row.fileList.length"
+                <span v-if="scope.row.fileList.length">{{ scope.row.fileList.length }} Instances</span>
-                  >{{ scope.row.fileList.length }} Instances</span
-                >
                 <span v-else style="color: #f44336">N/A</span>
               </div>
             </div>
@@ -217,8 +131,7 @@
               </div>
               <div style="display: inline-block">
                 <span v-if="scope.row.dicomInfo.description">
-                  {{ scope.row.dicomInfo.description }}</span
+                  {{ scope.row.dicomInfo.description }}</span>
-                >
                 <span v-else style="color: #f44336">N/A</span>
               </div>
             </div>
@@ -242,16 +155,12 @@
         <template slot-scope="scope">
           <div style="line-height: 15px">
             <div>
-              <span v-if="scope.row.dicomInfo.patientId"
+              <span v-if="scope.row.dicomInfo.patientId"><span style="font-weight: 500">PID: </span>{{
-                ><span style="font-weight: 500">PID: </span
+                scope.row.dicomInfo.patientId }}</span>
-                >{{ scope.row.dicomInfo.patientId }}</span
-              >
               <span v-else style="color: #f44336">N/A</span>
             </div>
             <div>
-              <span
+              <span :class="[scope.row.dicomInfo.patientName ? '' : 'colorOfRed']">
-                :class="[scope.row.dicomInfo.patientName ? '' : 'colorOfRed']"
-              >
                 {{
                   scope.row.dicomInfo.patientName
                     ? scope.row.dicomInfo.patientName
@@ -260,9 +169,7 @@
               </span>
             </div>
             <div>
-              <span
+              <span :class="[scope.row.dicomInfo.patientSex ? '' : 'colorOfRed']">
-                :class="[scope.row.dicomInfo.patientSex ? '' : 'colorOfRed']"
-              >
                 {{
                   scope.row.dicomInfo.patientSex
                     ? scope.row.dicomInfo.patientSex
@@ -270,9 +177,7 @@
                 }},
               </span>
 
-              <span
+              <span :class="[scope.row.dicomInfo.patientAge ? '' : 'colorOfRed']">
-                :class="[scope.row.dicomInfo.patientAge ? '' : 'colorOfRed']"
-              >
                 {{
                   scope.row.dicomInfo.patientAge
                     ? scope.row.dicomInfo.patientAge
@@ -280,11 +185,9 @@
                 }},
               </span>
 
-              <span
+              <span :class="[
-                :class="[
+                scope.row.dicomInfo.patientBirthDate ? '' : 'colorOfRed',
-                  scope.row.dicomInfo.patientBirthDate ? '' : 'colorOfRed',
+              ]">
-                ]"
-              >
                 {{
                   scope.row.dicomInfo.patientBirthDate
                     ? scope.row.dicomInfo.patientBirthDate
@@ -295,21 +198,14 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column
+      <el-table-column :label="$t('trials:uploadDicomList:table:failedFileCount')" min-width="150"
-        :label="$t('trials:uploadDicomList:table:failedFileCount')"
+        show-overflow-tooltip>
-        min-width="150"
-        show-overflow-tooltip
-      >
         <template slot-scope="scope">
-          <el-progress
+          <el-progress color="#409eff" :percentage="(
-            color="#409eff"
+            (scope.row.dicomInfo.uploadFileSize * 100) /
-            :percentage="
+            (scope.row.dicomInfo.fileSize ? scope.row.dicomInfo.fileSize : 1)
-              (
+          ).toFixed(2) * 1
-                (scope.row.dicomInfo.uploadFileSize * 100) /
+            " />
-                scope.row.dicomInfo.fileSize
-              ).toFixed(2) * 1
-            "
-          />
           <span>
             {{ $t('trials:uploadDicomList:table:uploadNow')
             }}{{ scope.row.dicomInfo.failedFileCount }}/{{
@@ -324,85 +220,52 @@
         </template>
       </el-table-column>
 
-      <el-table-column
+      <el-table-column :label="$t('trials:uploadDicomList:table:status')" min-width="140" show-overflow-tooltip>
-        :label="$t('trials:uploadDicomList:table:status')"
-        min-width="140"
-        show-overflow-tooltip
-      >
         <template slot-scope="scope">
-          <span
+          <span v-if="
-            v-if="
+            !scope.row.dicomInfo.failedFileCount &&
-              !scope.row.dicomInfo.failedFileCount &&
+            !scope.row.dicomInfo.isInit
-              !scope.row.dicomInfo.isInit
+          ">
-            "
+            {{ $t('trials:uploadDicomList:table:status1') }}</span>
-          >
+          <span style="color: #409eff" v-else-if="
-            {{ $t('trials:uploadDicomList:table:status1') }}</span
+            !scope.row.dicomInfo.failedFileCount &&
-          >
+            scope.row.dicomInfo.isInit &&
-          <span
+            btnLoading
-            style="color: #409eff"
+          ">{{ $t('trials:uploadDicomList:table:status2') }}</span>
-            v-else-if="
+          <span style="color: #409eff" v-else-if="
-              !scope.row.dicomInfo.failedFileCount &&
+            scope.row.dicomInfo.failedFileCount <
-              scope.row.dicomInfo.isInit &&
+            scope.row.dicomInfo.fileCount && !scope.row.uploadState.record
-              btnLoading
+          ">{{ $t('trials:uploadDicomList:table:status2') }}</span>
-            "
+          <span style="color: #2cc368" v-else-if="
-            >{{ $t('trials:uploadDicomList:table:status2') }}</span
+            scope.row.dicomInfo.failedFileCount ===
-          >
+            scope.row.dicomInfo.fileCount
-          <span
+          ">{{ $t('trials:uploadDicomList:table:status3') }}</span>
-            style="color: #409eff"
+          <span style="color: #f66" v-else-if="
-            v-else-if="
+            scope.row.uploadState.record &&
-              scope.row.dicomInfo.failedFileCount <
+            scope.row.uploadState.record.fileCount === 0
-                scope.row.dicomInfo.fileCount && !scope.row.uploadState.record
+          ">{{ $t('trials:uploadDicomList:table:status5') }}</span>
-            "
-            >{{ $t('trials:uploadDicomList:table:status2') }}</span
-          >
-          <span
-            style="color: #2cc368"
-            v-else-if="
-              scope.row.dicomInfo.failedFileCount ===
-              scope.row.dicomInfo.fileCount
-            "
-            >{{ $t('trials:uploadDicomList:table:status3') }}</span
-          >
-          <span
-            style="color: #f66"
-            v-else-if="
-              scope.row.uploadState.record &&
-              scope.row.uploadState.record.fileCount === 0
-            "
-            >{{ $t('trials:uploadDicomList:table:status5') }}</span
-          >
           <span style="color: #f66" v-else>{{
             $t('trials:uploadDicomList:table:Failed')
           }}</span>
         </template>
       </el-table-column>
-      <el-table-column
+      <el-table-column :label="$t('trials:uploadDicomList:table:record')" min-width="140" show-overflow-tooltip>
-        :label="$t('trials:uploadDicomList:table:record')"
-        min-width="140"
-        show-overflow-tooltip
-      >
         <template slot-scope="scope">
           <el-tooltip placement="top" v-if="scope.row.uploadState.record">
             <div slot="content">
               <div style="max-height: 500px; overflow-y: auto">
                 {{ $t('trials:uploadDicomList:table:Existed') }}:
                 <div v-if="scope.row.uploadState.record.Existed.length">
-                  <div
+                  <div v-for="item of scope.row.uploadState.record.Existed" :key="item"
-                    v-for="item of scope.row.uploadState.record.Existed"
+                    style="font-size: 12px; color: #baa72a">
-                    :key="item"
-                    style="font-size: 12px; color: #baa72a"
-                  >
                     {{ item }}
                   </div>
                 </div>
                 <div v-else>&nbsp;</div>
                 {{ $t('trials:uploadDicomList:table:Uploaded') }}:
                 <div v-if="scope.row.uploadState.record.Uploaded.length">
-                  <div
+                  <div v-for="item of scope.row.uploadState.record.Uploaded" :key="item"
-                    v-for="item of scope.row.uploadState.record.Uploaded"
+                    style="font-size: 12px; color: #24b837">
-                    :key="item"
-                    style="font-size: 12px; color: #24b837"
-                  >
                     {{ item }}
                   </div>
                 </div>
@@ -410,11 +273,8 @@
                 <br />
                 {{ $t('trials:uploadDicomList:table:Failed') }}:
                 <div v-if="scope.row.uploadState.record.Failed.length">
-                  <div
+                  <div v-for="item of scope.row.uploadState.record.Failed" :key="item"
-                    v-for="item of scope.row.uploadState.record.Failed"
+                    style="font-size: 12px; color: #f66">
-                    :key="item"
-                    style="font-size: 12px; color: #f66"
-                  >
                     {{ item }}
                   </div>
                 </div>
@@ -438,16 +298,8 @@
         </template>
       </el-table-column>
     </el-table>
-    <study-view
+    <study-view v-if="model_cfg.visible" :model_cfg="model_cfg" :IsDicom="true" :bodyPart="bodyPart"
-      v-if="model_cfg.visible"
+      :modelList="modelList" :isUpload="openIsUpload" :TrialModality="TrialModality" @getList="getList" />
-      :model_cfg="model_cfg"
-      :IsDicom="true"
-      :bodyPart="bodyPart"
-      :modelList="modelList"
-      :isUpload="openIsUpload"
-      :TrialModality="TrialModality"
-      @getList="getList"
-    />
   </div>
 </template>
 <script>
@@ -554,17 +406,15 @@ export default {
       subjectVisitId: null,
       errStudyUidList: [],
       open: null,
-      bodyPart: [],
+      bodyPart: {},
       openIsUpload: false,
       TrialModality: [],
     }
   },
-  created() {
-    this.getList()
-  },
   async mounted() {
     this.trialId = this.$route.query.trialId
-    this.bodyPart = await this.$getBodyPart(this.$route.query.trialId)
+    this.bodyPart.Bodypart = await this.$getBodyPart(this.$route.query.trialId)
+    this.getList()
     this.uploadQueues = []
     this.OSSclient.close()
   },
@@ -794,8 +644,9 @@ export default {
           resolve()
         })
         var validFilesCount = 0
+        scope.uploadQueues = []
         for (var i = 0; i < checkFiles.length; ++i) {
-          ;(function (index) {
+          ; (function (index) {
             p = p.then(function () {
               if (
                 checkFiles[index].name.toUpperCase().indexOf('DICOMDIR') === -1
@@ -834,6 +685,7 @@ export default {
             var studyUid = data.string('x0020000d')
             if (!studyUid) return resolve()
             var pixelDataElement = data.elements.x7fe00010
+            if (!pixelDataElement && modality !== 'SR') return resolve()
             var studyIndex = 0
             while (
               studyIndex < scope.uploadQueues.length &&
@@ -878,6 +730,15 @@ 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,
                   patientId: data.string('x00100020'),
                   patientName: patientNameStr,
@@ -988,6 +849,11 @@ 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,
                 modality: data.string('x00080060') || '',
                 description: seriesDescriptionStr,
@@ -1026,7 +892,25 @@ 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'),
+                MediaStorageSOPInstanceUID: instanceUid,
+                MediaStorageSOPClassUID: data.string('x00080016'),
                 instanceNumber: data.intString('x00200013') || 1,
                 frameCount: data.intString('x00280008') || 1,
                 instanceTime: instanceTime,
@@ -1034,7 +918,7 @@ export default {
                 imageColumns: data.uint16('x00280011') || 0,
                 sliceLocation: data.intString('x00201041') || 0,
                 sliceThickness: data.string('x00180050') || '',
-                numberOfFrames: data.intString('x00280008') || 0,
+                numberOfFrames: data.intString('x00280008') || 1,
                 pixelSpacing: data.string('x00280030') || '',
                 imagerPixelSpacing: data.string('x00181164') || '',
                 frameOfReferenceUID: data.string('x00200052') || '',
@@ -1235,7 +1119,16 @@ export default {
                   acquisitionNumber: dicomInfo.acquisitionNumber,
                   triggerTime: dicomInfo.triggerTime,
                   bodyPartExamined: '',
+                  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 = []
@@ -1259,6 +1152,10 @@ export default {
                             instanceList.push({
                               studyInstanceUid: dicomInfo.studyUid,
                               seriesInstanceUid: v.seriesUid,
+                              SOPClassUID: o.SOPClassUID,
+                              TransferSytaxUID: o.TransferSytaxUID,
+                              MediaStorageSOPInstanceUID: o.MediaStorageSOPInstanceUID,
+                              MediaStorageSOPClassUID: o.MediaStorageSOPClassUID,
                               sopInstanceUid: o.instanceUid,
                               instanceNumber: o.instanceNumber,
                               instanceTime: o.instanceTime,
@@ -1274,21 +1171,33 @@ 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++
                             Record.FileCount++
                           } else {
-                            let path = `/${params.trialId}/Image/${
+                            let path = `/${params.trialId}/Image/${params.subjectId
-                              params.subjectId
+                              }/${params.subjectVisitId}/${dicomInfo.visitTaskId
-                            }/${params.subjectVisitId}/${
+                              }/${scope.getGuid(
-                              dicomInfo.visitTaskId
+                                dicomInfo.studyUid +
-                            }/${scope.getGuid(
-                              dicomInfo.studyUid +
                                 v.seriesUid +
                                 o.instanceUid +
                                 params.trialId
-                            )}`
+                              )}`
                             if (scope.isClose) return
                             let res = await dcmUpload(
                               {
@@ -1342,6 +1251,10 @@ export default {
                                 studyInstanceUid: dicomInfo.studyUid,
                                 seriesInstanceUid: v.seriesUid,
                                 sopInstanceUid: o.instanceUid,
+                                SOPClassUID: o.SOPClassUID,
+                                TransferSytaxUID: o.TransferSytaxUID,
+                                MediaStorageSOPInstanceUID: o.MediaStorageSOPInstanceUID,
+                                MediaStorageSOPClassUID: o.MediaStorageSOPClassUID,
                                 instanceNumber: o.instanceNumber,
                                 instanceTime: o.instanceTime,
                                 imageRows: o.imageRows,
@@ -1356,6 +1269,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)
@@ -1387,6 +1314,8 @@ export default {
                   seriesInstanceUid: v.seriesUid,
                   seriesNumber: v.seriesNumber,
                   seriesTime: v.seriesTime,
+                  DicomSeriesDate: v.DicomSeriesDate,
+                  DicomSeriesTime: v.DicomSeriesTime,
                   sliceThickness: v.sliceThickness,
                   imagePositionPatient: v.imagePositionPatient,
                   imageOrientationPatient: v.imageOrientationPatient,
@@ -1402,6 +1331,9 @@ export default {
                   bodyPartExamined: dicomInfo.bodyPart,
                   instanceList: instanceList,
                   ImageResizePath: ImageResizePath,
+
+                  RadiopharmaceuticalInformationSequence: v.RadiopharmaceuticalInformationSequence,
+                  AcquisitionDate: v.AcquisitionDate,
                 })
               }
               let text = JSON.stringify(Record)
@@ -1559,16 +1491,19 @@ export default {
   align-items: center;
   justify-content: space-between;
 }
+
 .btnBox,
 .form-group {
   display: flex;
   align-items: center;
 }
+
 #inputForm .file-input {
   position: relative;
   overflow: hidden;
   display: inline-block;
 }
+
 #inputForm .file-input input[type='file'] {
   position: absolute;
   top: 0;
@@ -1578,10 +1513,12 @@ export default {
   opacity: 0;
   cursor: pointer;
 }
+
 .tip {
   display: flex;
   align-items: flex-start;
   margin-top: 5px;
+
   i {
     margin: 3px 5px 0 0;
   }

src/components/uploadDicomAndNonedicom/nonedicomFile.vue

@@ -18,7 +18,11 @@
       <el-table-column prop="Modality" :label="$t('upload:nonedicom:table:molityType')" sortable="custom">
       </el-table-column>
       <!--检查部位-->
-      <el-table-column prop="BodyPart" :label="$t('upload:nonedicom:table:bodyPart')" sortable="custom" />
+      <el-table-column prop="BodyPart" :label="$t('upload:nonedicom:table:bodyPart')" sortable="custom">
+        <template slot-scope="scope">
+          <span>{{ getBodyPart(scope.row.BodyPart, scope.row.BodyPartForEditOther) }}</span>
+        </template>
+      </el-table-column>
       <!--原文件数-->
       <el-table-column prop="FileCount" :label="$t('upload:nonedicom:table:fileCount')">
         <template slot-scope="scope">
@@ -29,9 +33,7 @@
               <el-table-column prop="FileSize" :label="$t('trials:audit:table:nonDicomsFileSize')" width="100">
                 <template slot-scope="scope">
                   <span>{{
-                    scope.row.FileSize && scope.row.FileSize > 0
+                    $FormatSize(scope.row.FileSize)
-                      ? `${(scope.row.FileSize / 1024 / 1024).toFixed(3)}MB`
-                      : ''
                   }}</span>
                 </template>
               </el-table-column>
@@ -68,9 +70,7 @@
               <el-table-column prop="FileSize" :label="$t('trials:audit:table:nonDicomsFileSize')" width="100">
                 <template slot-scope="scope">
                   <span>{{
-                    scope.row.FileSize && scope.row.FileSize > 0
+                    $FormatSize(scope.row.FileSize)
-                      ? `${(scope.row.FileSize / 1024 / 1024).toFixed(3)}MB`
-                      : ''
                   }}</span>
                 </template>
               </el-table-column>
@@ -266,6 +266,7 @@ export default {
       currentRow: {},
       studyMonitorId: null,
       open: null,
+      BodyPart: {}
     }
   },
   watch: {
@@ -293,7 +294,8 @@ export default {
       store.dispatch('trials/setUnLock', this.btnLoading)
     },
   },
-  created() {
+  async created() {
+    this.BodyPart.Bodypart = await this.$getBodyPart(this.$route.query.trialId)
     this.getList()
   },
   beforeDestroy() {
@@ -678,6 +680,26 @@ export default {
       let blob = new Blob(['\ufeff', text], { type: 'text/plain' })
       return blob
     },
+    getBodyPart(bodyPart, other) {
+      if (!bodyPart && !other) return ''
+      var separator = ','
+      if (bodyPart.indexOf('|') > -1) {
+        separator = '|'
+      } else if (bodyPart.indexOf(',') > -1) {
+        separator = ','
+      } else if (bodyPart.indexOf('，') > -1) {
+        separator = '，'
+      }
+      var arr = bodyPart.split(separator)
+      var newArr = arr.map((i) => {
+        return this.$fd('Bodypart', i.trim(), 'Code', this.BodyPart, 'Name')
+      })
+      if (other) {
+        newArr.push(other)
+      }
+      newArr = newArr.filter(Boolean)
+      return newArr.join(' | ')
+    },
   },
 }
 </script>

src/components/uploadDicomAndNonedicom/study-view.vue

@@ -4,118 +4,49 @@
       <div slot="dialog-body">
         <el-table :data="modelList" style="width: 100%" height="300">
           <!--检查编号-->
-          <el-table-column
+          <el-table-column prop="StudyCode" :label="$t('trials:uploadImage:table:StudyCode')" />
-            prop="StudyCode"
-            :label="$t('trials:uploadImage:table:StudyCode')"
-          />
           <!--检查类型-->
-          <el-table-column
+          <el-table-column prop="ModalityForEdit" :label="$t('trials:uploadImage:table:ModalityForEdit')"
-            prop="ModalityForEdit"
+            v-if="IsDicom" />
-            :label="$t('trials:uploadImage:table:ModalityForEdit')"
-            v-if="IsDicom"
-          />
           <!--检查模态-->
-          <el-table-column
+          <el-table-column prop="Modalities" :label="$t('trials:uploadImage:table:Modalities')" v-if="IsDicom" />
-            prop="Modalities"
-            :label="$t('trials:uploadImage:table:Modalities')"
-            v-if="IsDicom"
-          />
           <!--检查部位-->
-          <el-table-column
+          <el-table-column prop="BodyPartForEdit" :label="$t('trials:uploadImage:table:BodyPartForEdit')"
-            prop="BodyPartForEdit"
+            v-if="IsDicom">
-            :label="$t('trials:uploadImage:table:BodyPartForEdit')"
-            v-if="IsDicom"
-          >
             <template slot-scope="scope">
-              <span>{{
+              <span>{{ getBodyPart(scope.row.BodyPartForEdit, scope.row.BodyPartForEditOther) }}</span>
-                $fd(
-                  'Bodypart',
-                  scope.row.BodyPartForEdit,
-                  'Code',
-                  { Bodypart: bodyPart },
-                  'Name'
-                )
-              }}</span>
             </template>
           </el-table-column>
           <!--序列数量-->
-          <el-table-column
+          <el-table-column prop="ReadingSeriesCount" :label="$t('trials:uploadImage:table:SeriesCount')"
-            prop="ReadingSeriesCount"
+            v-if="IsDicom" />
-            :label="$t('trials:uploadImage:table:SeriesCount')"
-            v-if="IsDicom"
-          />
           <!--图像数量-->
-          <el-table-column
+          <el-table-column prop="ReadingInstanceCount" :label="$t('trials:uploadImage:table:InstanceCount')"
-            prop="ReadingInstanceCount"
+            v-if="IsDicom" />
-            :label="$t('trials:uploadImage:table:InstanceCount')"
-            v-if="IsDicom"
-          />
           <!--检查时间-->
-          <el-table-column
+          <el-table-column prop="StudyTime" :label="$t('trials:uploadImage:table:StudyTime')" v-if="IsDicom"
-            prop="StudyTime"
+            min-width="130" />
-            :label="$t('trials:uploadImage:table:StudyTime')"
-            v-if="IsDicom"
-            min-width="130"
-          />
           <!--检查模态-->
-          <el-table-column
+          <el-table-column prop="Modality" :label="$t('trials:uploadImage:table:Modalities')" v-if="!IsDicom" />
-            prop="Modality"
-            :label="$t('trials:uploadImage:table:Modalities')"
-            v-if="!IsDicom"
-          />
           <!--检查部位-->
-          <el-table-column
+          <el-table-column prop="BodyPart" :label="$t('trials:uploadImage:table:BodyPartForEdit')" v-if="!IsDicom">
-            prop="BodyPart"
-            :label="$t('trials:uploadImage:table:BodyPartForEdit')"
-            v-if="!IsDicom"
-          >
             <template slot-scope="scope">
-              <span>{{
+              <span>{{ getBodyPart(scope.row.BodyPart, scope.row.BodyPartForEditOther) }}</span>
-                $fd(
-                  'Bodypart',
-                  scope.row.BodyPart,
-                  'Code',
-                  { Bodypart: bodyPart },
-                  'Name'
-                )
-              }}</span>
             </template>
           </el-table-column>
           <!--文件数量-->
-          <el-table-column
+          <el-table-column prop="ReadingFileCount" :label="$t('trials:uploadImage:table:FileCount')" v-if="!IsDicom" />
-            prop="ReadingFileCount"
-            :label="$t('trials:uploadImage:table:FileCount')"
-            v-if="!IsDicom"
-          />
           <!--检查时间-->
-          <el-table-column
+          <el-table-column prop="ImageDate" :label="$t('trials:uploadImage:table:StudyTime')" v-if="!IsDicom"
-            prop="ImageDate"
+            min-width="130" />
-            :label="$t('trials:uploadImage:table:StudyTime')"
+          <el-table-column :label="$t('common:action:action')" fixed="right" width="80">
-            v-if="!IsDicom"
-            min-width="130"
-          />
-          <el-table-column
-            :label="$t('common:action:action')"
-            fixed="right"
-            width="80"
-          >
             <template slot-scope="scope">
               <!--预览--->
-              <el-button
+              <el-button circle icon="el-icon-view" :title="$t('trials:uploadImage:button:preview')" v-if="!isUpload"
-                circle
+                @click.stop="preview(scope.row)" />
-                icon="el-icon-view"
-                :title="$t('trials:uploadImage:button:preview')"
-                v-if="!isUpload"
-                @click.stop="preview(scope.row)"
-              />
               <!--编辑--->
-              <el-button
+              <el-button circle icon="el-icon-edit-outline" :title="$t('trials:uploadImage:button:edit')" v-else
-                circle
+                @click.stop="openEdit(scope.row)" />
-                icon="el-icon-edit-outline"
-                :title="$t('trials:uploadImage:button:edit')"
-                v-else
-                @click.stop="openEdit(scope.row)"
-              />
             </template>
           </el-table-column>
         </el-table>
@@ -124,42 +55,20 @@
     <!--新增检查部位-->
     <base-model v-if="editModality_model.visible" :config="editModality_model">
       <template slot="dialog-body">
-        <el-form
+        <el-form ref="editModalityform" :inline="true" :model="form" class="demo-form-inline" :rules="rules">
-          ref="editModalityform"
+          <el-form-item :label="$t('trials:uploadImage:form:ModalityForEdit')" prop="Modality" label-width="150px">
-          :inline="true"
-          :model="form"
-          class="demo-form-inline"
-          :rules="rules"
-        >
-          <el-form-item
-            :label="$t('trials:uploadImage:form:ModalityForEdit')"
-            prop="Modality"
-            label-width="150px"
-          >
             <el-select v-model="form.Modality" placeholder="">
-              <el-option
+              <el-option v-for="item in TrialModality" :key="item" :label="item" :value="item">
-                v-for="item in TrialModality"
-                :key="item"
-                :label="item"
-                :value="item"
-              >
               </el-option>
             </el-select>
           </el-form-item>
         </el-form>
       </template>
       <template slot="dialog-footer">
-        <el-button
+        <el-button type="primary" @click="updateTaskStudyModality" :loading="loading">
-          type="primary"
-          @click="updateTaskStudyModality"
-          :loading="loading"
-        >
           {{ $t('common:button:confirm') }}
         </el-button>
-        <el-button
+        <el-button @click="editModality_model.visible = false" :loading="loading">
-          @click="editModality_model.visible = false"
-          :loading="loading"
-        >
           {{ $t('common:button:cancel') }}
         </el-button>
       </template>
@@ -180,9 +89,9 @@ export default {
       },
     },
     bodyPart: {
-      type: Array,
+      type: Object,
       default: () => {
-        return []
+        return {}
       },
     },
     modelList: {
@@ -206,7 +115,6 @@ export default {
       default: true,
     },
     isUpload: {
-      required: true,
       type: Boolean,
       default: false,
     },
@@ -236,6 +144,7 @@ export default {
         ],
       },
       loading: false,
+      BodyPart: {}
     }
   },
   methods: {
@@ -284,8 +193,28 @@ export default {
         console.log(err)
       }
     },
+    getBodyPart(bodyPart, other) {
+      if (!bodyPart && !other) return ''
+      var separator = ','
+      if (bodyPart.indexOf('|') > -1) {
+        separator = '|'
+      } else if (bodyPart.indexOf(',') > -1) {
+        separator = ','
+      } else if (bodyPart.indexOf('，') > -1) {
+        separator = '，'
+      }
+      var arr = bodyPart.split(separator)
+      console.log(this.bodyPart)
+      var newArr = arr.map((i) => {
+        return this.$fd('Bodypart', i.trim(), 'Code', this.bodyPart, 'Name')
+      })
+      if (other) {
+        newArr.push(other)
+      }
+      newArr = newArr.filter(Boolean)
+      return newArr.join(' | ')
+    },
   },
 }
 </script>
-<style lang="scss" scoped>
+<style lang="scss" scoped></style>
-</style>

src/const/sign-code.vue

@@ -32,7 +32,7 @@ export default {
     ResetImageQualityControlQuestion: 112, // 重置影像质控问题
     CreateReviewTask: 113, // 生成复核任务
     ReviewImageQualityControlQuestion: 219, // 复核质控问题
-
+    CorrectImageExaminationInformation: 220, // 更正影像检查信息
   },
 };
 </script>

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>

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>

src/icons/svg/elliptical.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="1751350116150" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="20392" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M870.4 819.2a51.2 51.2 0 1 1 0 102.4 51.2 51.2 0 0 1 0-102.4zM512 179.2a332.8 332.8 0 1 1 0 665.6 332.8 332.8 0 0 1 0-665.6z m0 51.2a281.6 281.6 0 1 0 0 563.2 281.6 281.6 0 0 0 0-563.2zM153.6 102.4a51.2 51.2 0 1 1 0 102.4 51.2 51.2 0 0 1 0-102.4z" fill="#ADAEB8" p-id="20393"></path></svg>

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>

src/icons/svg/lengthscale.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="1751349783728" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9505" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M838.4 279.466667zM802.133333 814.933333H279.466667c-38.4 0-70.4-32-70.4-70.4V219.733333c0-38.4 32-70.4 70.4-70.4h123.733333c38.4 0 70.4 32 70.4 70.4v339.2h347.733333c2.133333 0-2.133333 0 0 0 25.6-2.133333 51.2 21.333333 51.2 46.933334v136.533333c0 40.533333-32 72.533333-70.4 72.533333z m25.6-179.2c2.133333-29.866667-34.133333-27.733333-34.133333-27.733333H445.866667c-2.133333 0-2.133333-2.133333-4.266667-2.133333h-2.133333c-8.533333-4.266667-12.8-10.666667-12.8-21.333334v-362.666666c0-14.933333-12.8-27.733333-27.733334-27.733334h-117.333333c-14.933333 0-27.733333 12.8-27.733333 27.733334v64h115.2c12.8 0 23.466667 10.666667 23.466666 23.466666 0 12.8-10.666667 23.466667-23.466666 23.466667h-115.2v78.933333h78.933333c12.8 0 23.466667 10.666667 23.466667 23.466667 0 12.8-10.666667 23.466667-23.466667 23.466667h-78.933333v78.933333h115.2c12.8 0 23.466667 10.666667 23.466666 23.466667 0 12.8-10.666667 23.466667-23.466666 23.466666h-115.2v149.333334c0 14.933333 12.8 27.733333 27.733333 27.733333H426.666667v-85.333333c0-12.8 10.666667-25.6 23.466666-25.6 12.8 0 23.466667 10.666667 23.466667 25.6v85.333333h96v-68.266667c0-12.8 10.666667-25.6 23.466667-25.6 12.8 0 23.466667 10.666667 23.466666 25.6V768h78.933334v-85.333333c0-12.8 10.666667-25.6 23.466666-25.6 12.8 0 23.466667 10.666667 23.466667 25.6v85.333333h51.2c14.933333 0 27.733333-12.8 27.733333-27.733333l6.4-104.533334z" p-id="9506"></path></svg>

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>

src/icons/svg/readingChart.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1763446648844" class="icon" viewBox="0 0 1321 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3570" xmlns:xlink="http://www.w3.org/1999/xlink" width="258.0078125" height="200"><path d="M1187.981 845.871H200.885V120.065C200.885 91.032 177.659 62 142.82 62s-58.064 23.226-58.064 58.065v783.87c0 29.033 23.225 58.065 58.064 58.065h1045.161c29.033 0 58.065-23.226 58.065-58.065s-29.032-58.064-58.065-58.064z" fill="#1296db" p-id="3571"></path><path d="M287.981 317.484L555.078 485.87c11.613 5.806 17.42 5.806 29.032 5.806 17.42 0 34.84-5.806 46.452-23.225l185.806-255.484 191.613 145.161c23.226 17.42 58.065 11.613 75.484-11.613 17.42-23.226 11.613-58.064-11.613-75.484L839.594 96.84c-23.226-17.42-58.064-11.613-75.484 11.613L572.497 363.935 346.046 224.581c-23.226-17.42-58.065-5.807-75.484 17.419s-5.806 58.065 17.42 75.484z m29.033 505.161c29.032 0 58.064-23.226 58.064-58.064V532.323c0-29.033-23.226-58.065-58.064-58.065s-58.065 23.226-58.065 58.065v238.064c5.807 29.032 29.032 52.258 58.065 52.258zM502.82 619.42v150.968c0 29.032 23.226 58.065 58.065 58.065s58.064-23.226 58.064-58.065V619.42c0-29.032-23.226-58.064-58.064-58.064s-58.065 29.032-58.065 58.064z" fill="#1296db" p-id="3572"></path><path d="M740.885 416.194v354.193c0 29.032 23.225 58.065 58.064 58.065s58.065-23.226 58.065-58.065V416.194c0-29.033-23.226-58.065-58.065-58.065s-58.064 29.032-58.064 58.065z m296.129 92.903c-29.033 0-58.065 23.226-58.065 58.064v203.226c0 29.032 23.226 58.065 58.065 58.065s58.064-23.226 58.064-58.065V567.161c0-29.032-29.032-58.064-58.064-58.064z" fill="#1296db" p-id="3573"></path></svg>

src/main.js

@@ -26,6 +26,10 @@ Vue.use(VueClipboard)
 import permission from './utils/permission'
 Vue.use(permission)
 
+import { formatSize, guidToColor } from "./utils"
+Vue.prototype.$FormatSize = formatSize
+Vue.prototype.$GuidToColor = guidToColor
+
 import Viewer from 'v-viewer'
 import './assets/css/viewer.css'
 Viewer.setDefaults({
@@ -56,6 +60,10 @@ import Preview from '@/components/Preview/index'
 Vue.use(Preview)
 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'
@@ -197,6 +205,7 @@ async function VueInit() {
   // 获取版本信息
   let PublishInfo = await getCurrentPublishInfo();
   Vue.prototype.$version = PublishInfo.Result;
+  Vue.prototype.$companyInfo = PublishInfo.OtherInfo;
   // 获取检查部位
   Vue.prototype.$getBodyPart = (id) => {
     return new Promise(async (resolve, reject) => {
@@ -270,6 +279,20 @@ async function VueInit() {
     }
     return companyName;
   }
+  Vue.prototype.$reg = () => {
+    if (localStorage.getItem('CompanyInfo')) {
+      let { EmailRegexStr } = JSON.parse(localStorage.getItem('CompanyInfo'))
+      if (EmailRegexStr) {
+        return { EmailRegexStr }
+      }
+    } else if (Vue.prototype.$companyInfo) {
+      let { EmailRegexStr } = Vue.prototype.$companyInfo
+      if (EmailRegexStr) {
+        return { EmailRegexStr }
+      }
+    }
+    return { EmailRegexStr: '^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$' };
+  }
   Vue.prototype.$updateDictionary = function () {
     Vue.prototype.$d = function (code) {
       var dictInfo = res.Result
@@ -311,9 +334,9 @@ async function VueInit() {
       })
     }
     let CompanyInfo = JSON.parse(localStorage.getItem('CompanyInfo'))
-    if(CompanyInfo&&CompanyInfo.SystemShortName){
+    if (CompanyInfo && CompanyInfo.SystemShortName && text.toUpperCase() !== "CIRCLE") {
       let test = new RegExp('IRC', 'ig')
-        text = text.replace(test, CompanyInfo.SystemShortName)
+      text = text.replace(test, CompanyInfo.SystemShortName)
     }
     // return i18n.t(key)
     return text;

src/store/getters.js

@@ -34,6 +34,7 @@ const getters = {
   paymentHistoryQuery: state => state.financials.paymentHistoryQuery,
   revenusQuery: state => state.financials.revenusQuery,
   visitTaskList: state => state.reading.visitTaskList,
+  BodyPart: state => state.reading.BodyPart,
   organList: state => state.reading.organList,
   seriesStack: state => state.reading.seriesStack,
   activeHangingAgreement: state => state.reading.activeHangingAgreement,
@@ -50,6 +51,8 @@ const getters = {
   IsFirstSysDocNeedSign: state => state.user.IsFirstSysDocNeedSign,
   TrialStatusStr: state => state.user.TrialStatusStr,
   lastViewportTaskId: state => state.noneDicomReview.lastViewportTaskId,
-  currentTaskState: state => state.noneDicomReview.currentTaskState
+  currentTaskState: state => state.noneDicomReview.currentTaskState,
+  operateInfo: state => state.dicom3d.operateInfo,
+  deleteAnnotationIds: state => state.dicom3d.deleteAnnotationIds
 }
 export default getters

src/store/index.js

@@ -13,6 +13,7 @@ import financials from './modules/financials'
 import reading from './modules/reading'
 import lang from './modules/lang'
 import noneDicomReview from './modules/noneDicomReview'
+import dicom3d from './modules/dicom3d'
 Vue.use(Vuex)
 
 const store = new Vuex.Store({
@@ -28,7 +29,8 @@ const store = new Vuex.Store({
     financials,
     reading,
     lang,
-    noneDicomReview
+    noneDicomReview,
+    dicom3d
   },
   getters
 })

src/store/modules/dicom3d.js

@@ -0,0 +1,28 @@
+const getDefaultState = () => {
+  return {
+    operateInfo: [],
+    deleteAnnotationIds: []
+  }
+}
+const state = getDefaultState
+
+const mutations = {
+
+}
+
+const actions = {
+  setOperateInfo({ state }, arr) {
+    state.operateInfo = arr
+  },
+  setDeleteAnnotationIds({ state }, arr) {
+    state.deleteAnnotationIds = arr
+  },
+}
+
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions
+}
+

src/store/modules/reading.js

@@ -32,7 +32,8 @@ const getDefaultState = () => {
     lastCanvasTaskId: '',
     imageQuality: null,
     imageQualityIssues: null,
-    currentLoadIns: []
+    currentLoadIns: [],
+    BodyPart: []
   }
 }
 function getQuestions(questions) {
@@ -171,6 +172,45 @@ function getQuestionAnswer(questions, questionMark, answers) {
     return ''
   }
 }
+function getQuerys(e) {
+  if (!e) return "";
+  var t = {},
+    r = [],
+    n = "",
+    a = "";
+  try {
+    var i = [];
+    if (e.indexOf("?") >= 0 && (i = e.substring(e.indexOf("?") + 1, e.length).split("&")), i.length > 0) for (var o in i) n = (r = i[o].split("="))[0],
+      a = r[1],
+      t[n] = a
+  } catch (s) {
+    t = {}
+  }
+  return t
+}
+async function getBodyPart(bodyPart, other) {
+  if (!bodyPart && !other) return ''
+  var separator = ','
+  if (bodyPart.indexOf('|') > -1) {
+    separator = '|'
+  } else if (bodyPart.indexOf(',') > -1) {
+    separator = ','
+  } else if (bodyPart.indexOf('，') > -1) {
+    separator = '，'
+  }
+  let BodyPart = {}
+  let query = getQuerys(window.location.href)
+  BodyPart.Bodypart = await Vue.prototype.$getBodyPart(query.trialId)
+  var arr = bodyPart.split(separator)
+  var newArr = arr.map((i) => {
+    return Vue.prototype.$fd('Bodypart', i.trim(), 'Code', BodyPart, 'Name')
+  })
+  if (other) {
+    newArr.push(other)
+  }
+  newArr = newArr.filter(Boolean)
+  return newArr
+}
 // function getKeySeriesInfo(keyInstance, series) {
 //   const obj = {}
 //   const set = new Set()
@@ -850,6 +890,20 @@ const actions = {
         var studyList = []
         var keyImages = []
         getReadingVisitStudyList(obj.trialId, obj.subjectVisitId, obj.visitTaskId).then(res => {
+          try {
+            state.BodyPart = []
+            res.Result.forEach(async item => {
+              let arr = await getBodyPart(item.BodyPartForEdit, item.BodyPartForEditOther)
+              state.BodyPart.push({
+                StudyId: item.StudyId,
+                StudyCode: item.StudyCode,
+                BodyPart: arr,
+                Modalities: item.Modalities
+              })
+            })
+          } catch (err) {
+            console.log(err)
+          }
           const i = res.Result.findIndex(i => i.IsCriticalSequence)
           if (i > -1) {
             const seriesList = res.Result[i].SeriesList && res.Result[i].SeriesList

src/store/modules/trials.js

@@ -10,7 +10,8 @@ const getDefaultState = () => {
     unlock: false,
     config: {},
     uploadTip: '0.00KB/s',
-    uploadSize: '',
+    downloadTip: '0.00KB/s',
+    downloadSize: '',
     timer: null,
     whiteList: [],
     checkTaskId: null

src/styles/index.scss

@@ -357,4 +357,18 @@ body .el-table th.gutter {
 
 .el-message-box__wrapper {
   z-index: 9999 !important;
+}
+
+.svg-readingChart {
+  width: 28px !important;
+  height: 30px !important;
+  margin-left: 10px;
+  cursor: pointer;
+}
+
+.svg-readingChart-mini {
+  width: 18px !important;
+  height: 20px !important;
+  vertical-align: -0.4em !important;
+  cursor: pointer;
 }

src/utils/dcmUpload/anonymization.js

@@ -15,6 +15,7 @@ export const anonymization = function (file, config) {
         let dataset = dcmjs.data.DicomMessage.readFile(buffer)
         for (var i = 0; i < AnonymizeFixedList.length; i++) {
           let AnonymizeFixed = AnonymizeFixedList[i]
+          if (!dataset.dict.hasOwnProperty(`${AnonymizeFixed.Group + AnonymizeFixed.Element}`)) continue
           if (dataset.dict[AnonymizeFixed.Group + AnonymizeFixed.Element]) {
             dataset.dict[AnonymizeFixed.Group + AnonymizeFixed.Element].Value[0] = AnonymizeFixed.ReplaceValue
           } else {
@@ -28,6 +29,7 @@ export const anonymization = function (file, config) {
         }
         for (var i = 0; i < AnonymizeNotFixedList.length; i++) {
           let AnonymizeNotFixed = AnonymizeNotFixedList[i]
+          // if (!dataset.dict.hasOwnProperty(`${AnonymizeNotFixed.Group + AnonymizeNotFixed.Element}`)) continue
           if (AnonymizeNotFixed.Group + AnonymizeNotFixed.Element === '00100020') {
             console.log(`${DicomStoreInfo.TrialCode}_${DicomStoreInfo.SubjectCode}`)
             if (dataset.dict[AnonymizeNotFixed.Group + AnonymizeNotFixed.Element]) {
@@ -42,7 +44,7 @@ export const anonymization = function (file, config) {
             }
           } else {
             if (dataset.dict[AnonymizeNotFixed.Group + AnonymizeNotFixed.Element]) {
-              dataset.dict[AnonymizeNotFixed.Group + AnonymizeNotFixed.Element].Value[0] = DicomStoreInfo[AnonymizeNotFixed.ReplaceValue] ? DicomStoreInfo[AnonymizeNotFixed.ReplaceValue].toString() : ''
+              dataset.dict[AnonymizeNotFixed.Group + AnonymizeNotFixed.Element].Value[0] = DicomStoreInfo[AnonymizeNotFixed.ReplaceValue] || Number(DicomStoreInfo[AnonymizeNotFixed.ReplaceValue]) === 0 ? DicomStoreInfo[AnonymizeNotFixed.ReplaceValue].toString() : ''
             } else {
               dataset.dict[AnonymizeNotFixed.Group + AnonymizeNotFixed.Element] = {
                 vr: AnonymizeNotFixed.ValueRepresentation,
@@ -53,9 +55,9 @@ export const anonymization = function (file, config) {
             }
           }
         }
-        // console.log(dataset)
+
         try {
-          let newDicomFile = dataset.write()
+          let newDicomFile = dataset.write() // fragmentMultiframe 原始数据是否进行分割
           const bufferArray = new Uint8Array(newDicomFile)
           const blob = new Blob([bufferArray], { type: 'application/octet-stream' })
           resolve({ blob, pixelDataElement })

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 => {
+        //         // 自定义数据转换
+
+        //     });
+    });
+}

src/utils/index.js

@@ -123,7 +123,7 @@ export function getNetWorkSpeed() {
         totalBytes = totalBytes / 1024;
         unit = "MB/s";
       }
-      store.state.trials.uploadTip = totalBytes.toFixed(3) + unit;
+      store.state.trials.downloadTip = totalBytes.toFixed(3) + unit;
     }
     if (timeList.length >= 5) {
       delete bytesReceivedPerSecond[timeList[0]]
@@ -189,11 +189,117 @@ export function workSpeedclose(isForce = false) {
   if (timer) {
     clearInterval(timer);
     timer = null;
-    store.state.trials.uploadTip = '0KB/s'
+    store.state.trials.downloadTip = '0KB/s'
-    store.state.trials.uploadSize = ''
+    store.state.trials.downloadSize = ''
   }
   bytesReceivedPerSecond = {};
   lastPercentage = 0;
   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;
 }

src/utils/request-download.js

@@ -50,7 +50,8 @@ service.interceptors.response.use(
         const a = document.createElement('a')
         // xls类型: application/vnd.ms-excel
         // xlsx类型：application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8
-        const href = URL.createObjectURL(new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8' }))
+        // const href = URL.createObjectURL(new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8' }))
+        const href = URL.createObjectURL(new Blob([res], { type: response.headers['content-type'] }))
         a.download = fileName
         a.href = href
         a.click()

src/utils/request.js

@@ -5,6 +5,7 @@ import router from '@/router'
 import WHITELIST from "./whiteList"
 import moment from 'moment-timezone';
 import { encryptConfig } from "@/utils/encrypt"
+import { customAgent } from './fingerprint'
 const ROUTER = require('@/router');
 axios.defaults.withCredentials = false
 const service = axios.create({
@@ -26,6 +27,8 @@ 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()
+    let fingerprint = await customAgent()
+    config.headers['BrowserFingerprint'] = fingerprint.visitorId
     if (config.ENCRYPT) {
       try {
         config = await encryptConfig(config)

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);
+}

src/utils/stream.js

@@ -1,6 +1,7 @@
 import streamSaver from "streamsaver";
 import "streamsaver/examples/zip-stream.js";
 import store from '@/store'
+import dcmjs from './dcmUpload/dcmjs'
 streamSaver.mitm = `${window.location.origin}/mitm.html?version=2.0.0`
 // 下载文件并压缩
 function zipFiles(zipName, files) {
@@ -19,7 +20,10 @@ function zipFiles(zipName, files) {
                     if (fileInfo.done) {//迭代终止  
                         ctrl.close();
                     } else {
-                        let { name, url } = fileInfo.value;
+                        let { name, url, IsEncapsulated = false } = fileInfo.value;
+                        if (IsEncapsulated) {
+                            url = await downloadFileToUrl(url)
+                        }
                         // url = decodeUtf8(url); // 待定，可能做过特殊处理
                         return fetch(url).then(res => {
                             ctrl.enqueue({
@@ -99,6 +103,24 @@ function decodeUtf8(bytes) {
     str2.pop();
     return str2.join("/") + '/' + name;
 }
+// 下载文件进行修改并输出本地url
+function downloadFileToUrl(url) {
+    return new Promise((resolve, reject) => {
+        const xhr = new XMLHttpRequest();
+        xhr.open('GET', url);
+        xhr.responseType = 'arraybuffer';
+        xhr.onload = function () {
+            const arraybuffer = xhr.response;
+            let dataset = dcmjs.data.DicomMessage.readFile(arraybuffer)
+            let newDicomFile = dataset.write({ fragmentMultiframe: false }) // fragmentMultiframe 原始数据是否进行分割
+            const bufferArray = new Uint8Array(newDicomFile)
+            const blob = new Blob([bufferArray], { type: 'application/octet-stream' })
+            const href = URL.createObjectURL(blob)
+            resolve(href)
+        };
+        xhr.send();
+    })
+}
 export async function downLoadFile(file, name, type = 'file') {
     if (type === 'zip') return await zipFiles(name, file);
     return await updateFile(file, name)

src/views/admin/user/components/UserInfo.vue

@@ -179,7 +179,8 @@ export default {
             trigger: 'blur',
           },
           {
-            type: 'email',
+            // type: 'email',
+            pattern: new RegExp(this.$reg().EmailRegexStr),
             message: 'Please input the correct email address',
             trigger: ['blur'],
           },

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'

src/views/dicom-show/dicom-study.vue

@@ -83,33 +83,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>
@@ -194,7 +197,8 @@ export default {
       currentLoadIns: [],
       isFromCRCUpload: false,
       isReading: null,
-      activeSeriesId: null
+      activeSeriesId: null,
+      isPacs: false
     }
   },
   created: function () {
@@ -211,6 +215,9 @@ export default {
     if (this.$router.currentRoute.query.isReading) {
       this.isReading = this.$router.currentRoute.query.isReading
     }
+    if (this.$router.currentRoute.query.isPacs) {
+      this.isPacs = Boolean(this.$router.currentRoute.query.isPacs)
+    }
     this.studyId = this.$router.currentRoute.query.studyId
     this.isFromCRCUpload = !!this.$router.currentRoute.query.isFromCRCUpload
     if (this.type === 'Series') {
@@ -241,7 +248,11 @@ export default {
   },
   methods: {
     async loadStudy() {
-      const data = await getStudyInfo(this.studyId)
+      let params = {}
+      if (this.isPacs) {
+        params.IsPacs = true
+      }
+      const data = await getStudyInfo(this.studyId, params)
       if (data.IsSuccess) {
         if (data.Result) {
           this.studyCode = data.Result.StudyCode
@@ -250,6 +261,11 @@ export default {
           this.description = data.Result.Description
         }
         let isReading = !!this.isReading ? `?IsReading=true` : ''
+        if (isReading && this.isPacs) {
+          isReading += `&IsPacs=true`
+        } else if (!isReading && this.isPacs) {
+          isReading = `?IsPacs=true`
+        }
         const url = `/series/list/${this.studyId}${isReading}`
         this.getSeriesList(url)
       }
@@ -300,7 +316,9 @@ export default {
               loadStatus: false,
               imageloadedArr: [],
               isExistMutiFrames: item.IsExistMutiFrames,
-              isShowPopper: false
+              isShowPopper: false,
+              subjectCode: item.SubjectCode,
+              visitName: item.VisitName
             })
           })
           this.seriesList = seriesList
@@ -360,7 +378,9 @@ export default {
               loadStatus: false,
               imageloadedArr: [],
               isExistMutiFrames: item.IsExistMutiFrames,
-              isShowPopper: false
+              isShowPopper: false,
+              subjectCode: item.SubjectCode,
+              visitName: item.VisitName
             })
           })
           this.seriesList = seriesList
@@ -430,7 +450,9 @@ export default {
           loadStatus: false,
           imageloadedArr: [],
           isExistMutiFrames: isExistMutiFrames,
-          isShowPopper: false
+          isShowPopper: false,
+          subjectCode: res.OtherInfo.SubjectCode,
+          visitName: res.OtherInfo.VisitName
         })
         this.seriesList = seriesList
         if (this.seriesList.length > 0) {
@@ -516,7 +538,9 @@ export default {
         isReading: series.isReading,
         isDeleted: series.isDeleted,
         previewImageUrl: series.previewImageUrl,
-        instanceCount: series.instanceCount
+        instanceCount: series.instanceCount,
+        subjectCode: series.SubjectCode,
+        visitName: series.VisitName
       }
       this.$refs.dicomViewer.loadImageStack(seriesInfo)
       if (!series.loadStatus) {
@@ -582,7 +606,9 @@ export default {
           keySeries: seriesInfo.KeySeries,
           loadStatus: false,
           imageloadedArr: [],
-          isShowPopper: false
+          isShowPopper: false,
+          subjectCode: seriesInfo.SubjectCode,
+          visitName: seriesInfo.VisitName
         })
         this.seriesList = seriesList
         if (this.seriesList.length > 0) {
@@ -861,13 +887,14 @@ export default {
         let file = this.seriesList[seriesIndex].instanceInfoList.find(item => item.ImageId === imageId)
         if (file && this.activeSeriesId === this.seriesList[seriesIndex].seriesId) {
           getNetWorkSpeed()
-          setNetWorkSpeedSize(percentComplete,  e.detail.total, imageId)
+          setNetWorkSpeedSize(percentComplete, e.detail.total, imageId)
         }
         if (prefetchInstanceCount >= instanceCount * 100) {
           this.seriesList[seriesIndex].prefetchInstanceCount = instanceCount * 100
           // 设置当前序列状态为已下载完成
           this.seriesList[seriesIndex].loadStatus = true
           workSpeedclose()
+          localStorage.setItem("QCRiskControl", 1)
           if (!this.isFromCRCUpload) {
             this.loadAllImages()
           }

src/views/dicom-show/dicom-visit.vue

@@ -113,35 +113,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>
@@ -417,7 +417,9 @@ export default {
                 loadStatus: false,
                 imageloadedArr: [],
                 isExistMutiFrames: series.IsExistMutiFrames,
-                isShowPopper: false
+                isShowPopper: false,
+                subjectCode: series.SubjectCode,
+                visitName: series.VisitName
               })
             })
             data.SeriesList = seriesList
@@ -518,7 +520,9 @@ export default {
         isReading: series.isReading,
         isDeleted: series.isDeleted,
         previewImageUrl: series.previewImageUrl,
-        instanceCount: series.instanceCount
+        instanceCount: series.instanceCount,
+        subjectCode: series.SubjectCode,
+        visitName: series.VisitName
       }
       this.$refs.dicomViewer.loadImageStack(seriesInfo)
       if (!series.loadStatus) {
@@ -792,7 +796,9 @@ export default {
                 loadStatus: false,
                 imageloadedArr: [],
                 isExistMutiFrames: item.IsExistMutiFrames,
-                isShowPopper: false
+                isShowPopper: false,
+                subjectCode: item.SubjectCode,
+                visitName: item.VisitName
               })
             })
             // scope.relationStudyList[index].seriesCount = seriesList.length
@@ -931,6 +937,7 @@ export default {
           this.loadAllImages()
         }
         workSpeedclose()
+        localStorage.setItem("QCRiskControl", 1)
       }
     }
   }

src/views/dictionary/attachment/components/SignatureTemplate/TemplateForm.vue

@@ -10,7 +10,7 @@
 
       <el-form-item :label="$t('dictionary:signature:form:File')">
         <div class="upload-container">
-          <el-upload class="upload-demo" action accept=".pdf" :before-upload="beforeUpload"
+          <el-upload class="upload-demo" action accept=".pdf,.mp4" :before-upload="beforeUpload"
             :http-request="handleUploadFile" :on-preview="handlePreview" :on-remove="handleRemoveFile"
             :show-file-list="true" :file-list="fileList" :limit="1" :on-exceed="handleExceed"
             :disabled="form.Type === ''">
@@ -229,7 +229,7 @@ export default {
       this.$message.warning(this.$t('upload:rule:maxFile1'))
     },
     checkFileSuffix(fileName) {
-      var typeArr = ['pdf']
+      var typeArr = ['pdf', 'mp4']
       var extendName = fileName
         .substring(fileName.lastIndexOf('.') + 1)
         .toLocaleLowerCase()

src/views/dictionary/attachment/components/SignatureTemplate/attachmentForm.vue

@@ -16,7 +16,7 @@
                         :http-request="handleUploadFile" :on-preview="handlePreview" :on-remove="handleRemoveFile"
                         :show-file-list="true" :file-list="fileList" :limit="1" :on-exceed="handleExceed">
                         <el-button size="small" type="primary" :loading="btnLoading">{{ $t('common:button:check')
-                        }}</el-button>
+                            }}</el-button>
                         <span slot="tip" style="margin-left: 10px" class="el-upload__tip">
                             ({{ $t('trials:signature:label:type').replace("xxx", this.accept.join(", ")) }})
                         </span>
@@ -82,7 +82,8 @@ export default {
                 '.doc',
                 '.docx',
                 '.xls',
-                '.xlsx']
+                '.xlsx',
+                '.mp4']
         }
     },
     mounted() {
@@ -172,18 +173,7 @@ export default {
             this.$message.warning(this.$t('upload:rule:maxFile1'))
         },
         checkFileSuffix(fileName) {
-            var typeArr = [
+            var typeArr = this.accept.map(item => item.split('.')[1])
-                'jpg',
-                'jpeg',
-                'png',
-                'pdf',
-                'ppt',
-                'pptx',
-                'doc',
-                'docx',
-                'xls',
-                'xlsx',
-            ]
             var extendName = fileName
                 .substring(fileName.lastIndexOf('.') + 1)
                 .toLocaleLowerCase()

src/views/dictionary/attachment/components/SignatureTemplate/attachmentList.vue

@@ -46,16 +46,16 @@
                 <!-- 新增/编辑附件 -->
                 <el-dialog :visible.sync="visible" :close-on-click-modal="false" :append-to-body="true" :title="title"
                     width="800px" custom-class="base-dialog-wrapper">
-                    <attachmentForm v-if="visible" :data="rowData" :SystemDocumentId="SystemDocumentId"
+                    <attachmentForm v-if="visible" :data="rowDATA" :SystemDocumentId="SystemDocumentId"
                         @closeDialog="closeDialog" @getList="getAllList" />
                 </el-dialog>
             </template>
         </base-model>
         <viewer ref="picture_perview2" style="margin: 0 10px"
-            v-if="rowData.FileFormat && ['png', 'jpg', 'jpeg'].includes(rowData.FileFormat.toLowerCase())"
+            v-if="rowDATA.FileFormat && ['png', 'jpg', 'jpeg'].includes(rowDATA.FileFormat.toLowerCase())"
-            :images="[`${OSSclientConfig.basePath}${rowData.FilePath}`]" :options="viewerOptions">
+            :images="[`${OSSclientConfig.basePath}${rowDATA.FilePath}`]" :options="viewerOptions">
 
-            <img v-show="false" :src="`${OSSclientConfig.basePath}${rowData.FilePath}`" alt="Image" />
+            <img v-show="false" :src="`${OSSclientConfig.basePath}${rowDATA.FilePath}`" alt="Image" />
         </viewer>
         <!-- <attachmentPreview :SystemDocumentId="SystemDocumentId" :visible.sync="perview_visible"
             v-if="perview_visible" /> -->
@@ -113,7 +113,7 @@ export default {
             visible: false,
             title: null,
             list: [],
-            rowData: {},
+            rowDATA: {},
             loading: false,
             viewerOptions: {
                 toolbar: {
@@ -167,7 +167,7 @@ export default {
             if (!row.Id) {
                 this.title = this.$t('dictionary:signature:attachmentForm:title:add')
             }
-            this.rowData = Object.assign({}, row)
+            this.rowDATA = Object.assign({}, row)
             this.visible = true
         },
         async getList() {
@@ -207,7 +207,7 @@ export default {
         },
         preview(data) {
             // return this.perview_visible = true
-            this.rowData = Object.assign({}, data)
+            this.rowDATA = Object.assign({}, data)
             if (['.ppt',
                 '.pptx',
                 '.doc',
@@ -234,6 +234,13 @@ export default {
                     title: data.Name,
                 })
             }
+            if (['.mp4'].includes(`.${data.FileFormat.toLowerCase()}`)) {
+                this.$video({
+                    path: data.Path || data.FilePath,
+                    type: 'mp4',
+                    title: data.Name,
+                })
+            }
         },
         // 排序
         handleSortByColumn(column) {

src/views/dictionary/attachment/components/SignatureTemplate/attachmentPreview.vue

@@ -70,10 +70,11 @@ import ppt from '@/assets/file_icon/ppt.png'
 import pptx from '@/assets/file_icon/pptx.png'
 import xls from '@/assets/file_icon/xls.png'
 import xlsx from '@/assets/file_icon/xlsx.png'
-import mp4 from '@/assets/file_icon/xlsx.png'
+import mp4 from '@/assets/file_icon/mp4.png'
 import PreviewFile from '@/components/PreviewFile'
 import imageViewer from './image-viewer'
 import { getSystemDocumentAttachmentList } from '@/api/dictionary'
+import { getTrialDocumentAttachmentList } from '@/api/trials'
 const defaultSearchData = () => {
     return {
         PageIndex: 1,
@@ -101,6 +102,20 @@ export default {
         isView: {
             type: Boolean,
             default: false
+        },
+        isTrial: {
+            type: Boolean,
+            default: false
+        },
+        isExternal: {
+            type: Boolean,
+            default: false
+        },
+        ExternalList: {
+            type: Array,
+            default: () => {
+                return []
+            }
         }
     },
     data() {
@@ -117,7 +132,8 @@ export default {
             rowData: {},
             list: [],
             searchData: defaultSearchData(),
-            title: this.$t('dictionary:signature:fileList')
+            title: this.$t('dictionary:signature:fileList'),
+            loading: false
         }
     },
     watch: {
@@ -126,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: {
@@ -140,13 +166,23 @@ export default {
         },
         async getList() {
             try {
+                if (this.isExternal) return
                 if (!this.SystemDocumentId) return false
                 this.loading = true
-                this.searchData.SystemDocumentId = this.SystemDocumentId
+                if (!this.isTrial) {
+                    this.searchData.SystemDocumentId = this.SystemDocumentId
+                } else {
+                    this.searchData.TrialDocumentId = this.SystemDocumentId
+                }
                 if (this.isView) {
                     this.searchData.OffLine = false
                 }
-                let res = await getSystemDocumentAttachmentList(this.searchData)
+                let res = null
+                if (!this.isTrial) {
+                    res = await getSystemDocumentAttachmentList(this.searchData)
+                } else {
+                    res = await getTrialDocumentAttachmentList(this.searchData)
+                }
                 this.loading = false
                 if (res.IsSuccess) {
                     this.list = res.Result.CurrentPageData

src/views/dictionary/attachment/components/ToolsTemplate/TemplateForm.vue

@@ -0,0 +1,269 @@
+<template>
+  <el-form ref="sysTemplateFrom" v-loading="loading" :model="form" label-width="140px" size="small" :rules="rules"
+    class="upload-temporary-file">
+    <div class="base-dialog-body">
+      <el-form-item :label="$t('dictionary:attachment:label:code')" prop="Code">
+        <el-input v-model="form.Code" />
+      </el-form-item>
+      <el-form-item :label="$t('dictionary:attachment:label:businessScenario')" prop="BusinessScenarioEnum">
+        <el-select v-model="form.BusinessScenarioEnum" style="width: 100%" size="small" filterable>
+          <el-option v-for="item of $d.Common_File_BusinessScenario" :key="item.id" :label="item.label"
+            :value="item.value" />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item :label="$t('dictionary:attachment:label:file')">
+        <div class="upload-container">
+          <el-upload class="upload-demo" action accept="" :before-upload="beforeUpload" :http-request="handleUploadFile"
+            :on-preview="handlePreview" :on-remove="handleRemoveFile" :show-file-list="true" :file-list="fileList"
+            :limit="1" :on-exceed="handleExceed" :disabled="(!form.FileTypeEnum && form.FileTypeEnum !== 0)">
+            <el-button size="small" type="primary" :disabled="(!form.FileTypeEnum && form.FileTypeEnum !== 0)"
+              :loading="btnLoading">Select</el-button>
+            <!-- <span slot="tip" style="margin-left: 10px" class="el-upload__tip">
+              (must be in xlsx/xls/doc/docx format)
+            </span> -->
+          </el-upload>
+        </div>
+      </el-form-item>
+      <el-form-item :label="$t('dictionary:attachment:label:name')" prop="Name">
+        <el-input v-model="form.Name" />
+      </el-form-item>
+      <el-form-item :label="$t('dictionary:attachment:export:form:nameCN')" prop="NameCN">
+        <el-input v-model="form.NameCN" />
+      </el-form-item>
+      <el-form-item v-if="form.Id !== ''" :label="$t('dictionary:attachment:label:isDeleted')">
+        <el-radio-group v-model="form.IsDeleted">
+          <el-radio v-for="item of $d.YesOrNo" :label="item.value" :key="item.id">{{ item.label }}</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item :label="$t('dictionary:attachment:label:description')">
+        <el-input v-model="form.Description" type="textarea" :autosize="{ minRows: 2, maxRows: 4 }" />
+      </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" :disabled="(!form.FileTypeEnum && form.FileTypeEnum !== 0)"
+          :loading="saveBtnLoading" @click="handleSave">{{ $t('common:button:save') }}</el-button>
+      </el-form-item>
+    </div>
+  </el-form>
+</template>
+<script>
+import {
+  addOrUpdateCommonDocument,
+  uploadCommonDoc,
+  Upload,
+} from '@/api/dictionary'
+import { getBasicDataSelects } from '@/api/dictionary/dictionary'
+export default {
+  name: 'TemplateForm',
+  props: {
+    data: {
+      type: Object,
+      default() {
+        return {}
+      },
+    },
+  },
+
+  data() {
+    return {
+      form: {
+        Id: '',
+        Code: '',
+        FileTypeEnum: 0,
+        BusinessScenarioEnum: null,
+        Name: '',
+        NameCN: '',
+        Path: '',
+        Description: '',
+        IsDeleted: false,
+      },
+      rules: {
+        Code: [
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur'] },
+        ],
+        Name: [
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur'] },
+        ],
+        NameCN: [
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur'] },
+        ],
+        BusinessScenarioEnum: [
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur'] },
+        ],
+      },
+      fileList: [],
+      btnLoading: false,
+      saveBtnLoading: false,
+      loading: false,
+      dictionaryList: {},
+    }
+  },
+  mounted() {
+    this.initForm()
+  },
+  methods: {
+    async initForm() {
+      await this.getDicData()
+      if (Object.keys(this.data).length > 0) {
+        if (this.data.Path) {
+          this.fileList = [
+            {
+              name: this.data.Name,
+              path: this.data.Path,
+              url: this.data.Path,
+              type: this.data.Type,
+            },
+          ]
+        }
+        for (const k in this.form) {
+          if (this.data.hasOwnProperty(k)) {
+            this.form[k] = this.data[k]
+          }
+        }
+      }
+    },
+    // 获取文件类型下拉框
+    getDicData() {
+      this.loading = true
+      getBasicDataSelects(['Common_File_ModuleType', 'Common_File_Type'])
+        .then((res) => {
+          this.dictionaryList = { ...res.Result }
+          this.loading = false
+        })
+        .catch(() => {
+          this.loading = false
+        })
+    },
+    beforeUpload(file) {
+      // 检测文件类型是否符合要求
+      if (this.checkFileSuffix(file.name)) {
+        this.fileList = []
+        return true
+      } else {
+        this.$alert(this.$t('dictionary:attachment:export:alert:formatFile'))
+
+        return false
+      }
+    },
+    async handleUploadFile(param) {
+      this.loading = true
+      this.form.FileName = param.file.name
+      let extendName = param.file.name
+        .substring(param.file.name.lastIndexOf('.'))
+        .toLocaleLowerCase()
+      let file = await this.fileToBlob(param.file)
+      let res = await this.OSSclient.put(`/System/Tools/${this.$guid()}${extendName}`, file)
+      this.form.Path = this.$getObjectName(res.url)
+      this.form.NameCN = param.file.name
+      this.fileList.push({
+        name: param.file.name,
+        path: this.form.Path,
+        fullPath: this.form.Path,
+        url: this.form.Path,
+      })
+      this.loading = false
+      this.btnLoading = false
+      // Upload(formData, 1).then((res) => {
+      //   this.fileList.push({
+      //     name: param.file.name,
+      //     path: res.Result.FilePath,
+      //     fullPath: res.Result.FullFilePath,
+      //     url: res.Result.FilePath,
+      //   })
+
+      // })
+    },
+    fileToBlob(file) {
+      // 创建 FileReader 对象
+      const reader = new FileReader()
+      return new Promise((resolve) => {
+        // FileReader 添加 load 事件
+        reader.addEventListener('load', (e) => {
+          let blob
+          if (typeof e.target.result === 'object') {
+            blob = new Blob([e.target.result])
+          } else {
+            blob = e.target.result
+          }
+          resolve(blob)
+        })
+        // FileReader 以 ArrayBuffer 格式 读取 File 对象中数据
+        reader.readAsArrayBuffer(file)
+      })
+    },
+    handleSave() {
+      this.$refs.sysTemplateFrom.validate((valid) => {
+        if (!valid) return
+        if (!this.form.Name) {
+          this.$alert(this.$t('dictionary:attachment:message:msg1'))
+          return
+        }
+        this.saveBtnLoading = true
+        addOrUpdateCommonDocument(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
+          })
+      })
+    },
+    handleRemoveFile() {
+      this.fileList = []
+      this.form.Path = ''
+      this.form.NameCN = ''
+      this.form.Name = ''
+    },
+    handlePreview(file) {
+      if (file.fullPath) {
+        window.open(file.fullPath, '_blank')
+      }
+    },
+    handleExceed(files, fileList) {
+      this.$message.warning(this.$t('upload:rule:maxFile1'))
+    },
+    checkFileSuffix(fileName) {
+      return true
+      var typeArr = ['xls', 'xlsx', 'doc', 'docx']
+      var extendName = fileName
+        .substring(fileName.lastIndexOf('.') + 1)
+        .toLocaleLowerCase()
+      if (typeArr.indexOf(extendName) !== -1) {
+        return true
+      } else {
+        return false
+      }
+    },
+  },
+}
+</script>
+
+<style lang="scss">
+.upload-temporary-file {
+  .upload-container .el-upload--text {
+    border: none;
+    width: 80px;
+    height: 40px;
+  }
+
+  .upload-container .el-input--small {
+    margin-bottom: 5px;
+  }
+
+  .upload-container .el-icon-circle-check {
+    color: #428bca;
+    font-size: 13px;
+  }
+
+  .account_item_clear {
+    .el-tag__close {
+      display: none !important;
+    }
+  }
+}
+</style>

src/views/dictionary/attachment/components/ToolsTemplate/index.vue

@@ -0,0 +1,238 @@
+<template>
+  <BaseContainer>
+    <template slot="search-container">
+      <el-form :inline="true" size="small">
+        <!-- 业务场景 -->
+        <el-form-item :label="$t('dictionary:attachment:label:businessScenario')">
+          <el-select v-model="searchData.BusinessScenarioEnum" style="width: 150px">
+            <el-option v-for="item of $d.Common_File_BusinessScenario" :key="item.value" :label="item.label"
+              :value="item.value" />
+          </el-select>
+        </el-form-item>
+        <!-- 文件名称 -->
+        <el-form-item :label="$t('dictionary:attachment:label:name')">
+          <el-input v-model="searchData.Name" style="width: 130px" clearable />
+        </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="Code" :label="$t('dictionary:attachment:label:code')" show-overflow-tooltip
+          sortable="custom" />
+        <!-- 业务场景 -->
+        <el-table-column prop="BusinessScenarioEnum" :label="$t('dictionary:attachment:label:businessScenario')"
+          show-overflow-tooltip sortable="custom">
+          <template slot-scope="scope">
+            {{
+              $fd(
+                'Common_File_BusinessScenario',
+                scope.row.BusinessScenarioEnum
+              )
+            }}
+          </template>
+        </el-table-column>
+        <!-- 文件名称 -->
+        <el-table-column prop="Name" :label="$t('dictionary:attachment:label:name')" show-overflow-tooltip
+          sortable="custom" />
+        <el-table-column prop="NameCN" :label="$t('dictionary:attachment:upload:table:nameCN')" show-overflow-tooltip
+          sortable="custom" />
+        <!-- 描述 -->
+        <el-table-column prop="Description" :label="$t('dictionary:attachment:label:description')"
+          show-overflow-tooltip />
+        <!-- 是否废除 -->
+        <el-table-column prop="IsDeleted" :label="$t('dictionary:attachment:label:isDeleted')" show-overflow-tooltip
+          sortable="custom">
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.IsDeleted" type="danger">{{
+              $fd('YesOrNo', scope.row.IsDeleted)
+            }}</el-tag>
+            <el-tag v-else type="primary">{{
+              $fd('YesOrNo', scope.row.IsDeleted)
+            }}</el-tag>
+          </template>
+        </el-table-column>
+        <!-- 上传时间 -->
+        <el-table-column prop="UpdateTime" :label="$t('dictionary:attachment:label:updateTime')" show-overflow-tooltip
+          sortable="custom" />
+
+        <el-table-column :label="$t('common:action:action')" width="300">
+          <template slot-scope="scope">
+            <!-- <el-button type="text" @click="PreviewFile(scope.row)">
+              {{ $t('common:button:preview') }}
+            </el-button> -->
+            <el-button type="text" @click="handleDownload(scope.row)">
+              {{ $t('common:button:download') }}
+            </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" width="600px" custom-class="base-dialog-wrapper">
+        <TemplateForm :data="currentRow" @closeDialog="closeDialog" @getList="getList" />
+      </el-dialog>
+    </template>
+  </BaseContainer>
+</template>
+<script>
+import {
+  getCommonDocumentList,
+  DownloadCommonDoc,
+  deleteCommonDocument,
+} from '@/api/dictionary'
+import BaseContainer from '@/components/BaseContainer'
+import Pagination from '@/components/Pagination'
+import TemplateForm from './TemplateForm'
+import { downLoadFile } from '@/utils/stream.js'
+const FileTypeEnum = 0
+const searchDataDefault = () => {
+  return {
+    FileTypeEnum: FileTypeEnum,
+    BusinessScenarioEnum: null,
+    Name: '',
+    PageIndex: 1,
+    PageSize: 20,
+  }
+}
+export default {
+  name: 'ToolsTemplate',
+  components: { BaseContainer, Pagination, TemplateForm },
+  data() {
+    return {
+      searchData: searchDataDefault(),
+      list: [],
+      total: 0,
+      currentRow: {},
+      editDialog: { title: '', visible: false },
+      loading: false,
+    }
+  },
+  mounted() {
+    this.getList()
+  },
+  computed: {
+    isEN() {
+      return this.$i18n.locale !== 'zh'
+    },
+  },
+  methods: {
+    handleDelete(row) {
+      // 确定删除该模版？
+      this.$confirm(this.$t('dictionary:attachment:message:msg1')).then(() => {
+        deleteCommonDocument(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
+      getCommonDocumentList(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 = { FileTypeEnum: FileTypeEnum }
+      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>

src/views/dictionary/attachment/index.vue

@@ -1,52 +1,22 @@
 <template>
   <div class="attachment-wrapper">
     <el-tabs v-model="activeTab" @tab-click="clickTab">
-      <el-tab-pane
+      <el-tab-pane v-for="item in $d.Common_File_Type" :key="item.value" :label="item.label" :name="String(item.value)">
-        v-for="item in $d.Common_File_Type"
+        <UploadTemplate v-if="activeTab === '1' && item.value == activeTab" @PreviewFile="PreviewFile" />
-        :key="item.value"
+        <ExportTemplate v-if="activeTab === '2' && item.value == activeTab" @PreviewFile="PreviewFile" />
-        :label="item.label"
-        :name="String(item.value)"
-      >
-        <UploadTemplate
-          v-if="activeTab === '1' && item.value == activeTab"
-          @PreviewFile="PreviewFile"
-        />
-        <ExportTemplate
-          v-if="activeTab === '2' && item.value == activeTab"
-          @PreviewFile="PreviewFile"
-        />
         <EmailTemplate v-if="activeTab === '3' && item.value == activeTab" />
         <CommonTemplate v-if="activeTab === '4' && item.value == activeTab" />
-        <SignatureTemplate
+        <SignatureTemplate v-if="activeTab === '5' && item.value == activeTab" />
-          v-if="activeTab === '5' && item.value == activeTab"
+        <ToolsTemplate v-if="activeTab === '0' && item.value == activeTab" />
-        />
       </el-tab-pane>
     </el-tabs>
     <!-- 预览 -->
-    <el-dialog
+    <el-dialog v-if="Preview.visible" :visible.sync="Preview.visible" :close-on-click-modal="false" :fullscreen="true"
-      v-if="Preview.visible"
+      :title="Preview.title" width="600px" custom-class="base-dialog-wrapper">
-      :visible.sync="Preview.visible"
+      <vue-office-docx v-if="docxTypes.includes(Preview.type)" :src="Preview.path" style="height: calc(100vh - 70px)"
-      :close-on-click-modal="false"
+        @rendered="renderedHandler" @error="errorHandler" />
-      :fullscreen="true"
+      <vue-office-excel v-else-if="excelTypes.includes(Preview.type)" :src="Preview.path" :options="options"
-      :title="Preview.title"
+        style="height: calc(100vh - 70px)" @rendered="renderedHandler" @error="errorHandler" />
-      width="600px"
-      custom-class="base-dialog-wrapper"
-    >
-      <vue-office-docx
-        v-if="docxTypes.includes(Preview.type)"
-        :src="Preview.path"
-        style="height: calc(100vh - 70px)"
-        @rendered="renderedHandler"
-        @error="errorHandler"
-      />
-      <vue-office-excel
-        v-else-if="excelTypes.includes(Preview.type)"
-        :src="Preview.path"
-        :options="options"
-        style="height: calc(100vh - 70px)"
-        @rendered="renderedHandler"
-        @error="errorHandler"
-      />
       <PreviewFile v-else :file-path="Preview.path" :file-type="Preview.type" />
     </el-dialog>
   </div>
@@ -57,6 +27,7 @@ import ExportTemplate from './components/ExportTemplate'
 import EmailTemplate from './components/EmailTemplate'
 import CommonTemplate from './components/CommonTemplate'
 import SignatureTemplate from './components/SignatureTemplate'
+import ToolsTemplate from './components/ToolsTemplate'
 import VueOfficeDocx from '@vue-office/docx'
 import '@vue-office/docx/lib/index.css'
 import VueOfficeExcel from '@vue-office/excel'
@@ -73,6 +44,7 @@ export default {
     VueOfficeDocx,
     VueOfficeExcel,
     PreviewFile,
+    ToolsTemplate
   },
   data() {
     return {
@@ -142,16 +114,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>
-

src/views/dictionary/newdictionary/components/DictionaryChild.vue

@@ -7,74 +7,28 @@
         <el-button type="primary" size="mini" @click="handleAdd">新建</el-button>
       </span>
     </div>
-    <el-table
+    <el-table v-loading="loading" v-adaptive="{ bottomOffset: 45 }" :data="list" stripe size="small" height="100"
-      v-loading="loading"
+      @sort-change="handleSortByColumn">
-      v-adaptive="{bottomOffset:45}"
-      :data="list"
-      stripe
-      size="small"
-      height="100"
-    >
       <el-table-column type="index" width="60" />
-      <el-table-column
+      <el-table-column v-if="!~$route.path.indexOf('select')" prop="Code" label="字典键值" min-width="180"
-        v-if="!~$route.path.indexOf('select')"
+        show-overflow-tooltip sortable='custom' />
-        prop="Code"
+      <el-table-column prop="ValueCN" label="中文值" min-width="180" show-overflow-tooltip sortable='custom' />
-        label="字典键值"
+      <el-table-column prop="Value" label="英文值" min-width="180" show-overflow-tooltip sortable='custom' />
-        min-width="180"
+      <el-table-column prop="ChildGroup" label="分组" min-width="180" show-overflow-tooltip sortable='custom' />
-        show-overflow-tooltip
+      <el-table-column prop="ShowOrder" label="显示顺序" min-width="180" show-overflow-tooltip sortable='custom' />
-      />
+      <el-table-column prop="Description" label="描述" min-width="180" show-overflow-tooltip sortable='custom' />
-      <el-table-column
-        prop="ValueCN"
-        label="中文值"
-        min-width="180"
-        show-overflow-tooltip
-      />
-      <el-table-column
-        prop="Value"
-        label="英文值"
-        min-width="180"
-        show-overflow-tooltip
-      />
-      <el-table-column
-        prop="ChildGroup"
-        label="分组"
-        min-width="180"
-        show-overflow-tooltip
-      />
-      <el-table-column
-        prop="ShowOrder"
-        label="显示顺序"
-        min-width="180"
-        show-overflow-tooltip
-      />
-      <el-table-column
-        prop="Description"
-        label="描述"
-        min-width="180"
-        show-overflow-tooltip
-      />
       <el-table-column label="是否可用" width="100" fixed="right">
         <template slot-scope="scope">
-          <el-switch
+          <el-switch v-model="scope.row.IsEnable" :active-value="true" :inactive-value="false"
-            v-model="scope.row.IsEnable"
+            @change="(event) => { return switchChange(event, scope.row) }" />
-            :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">
         <template slot-scope="scope">
-          <el-button
+          <el-button type="text" @click="handleEdit(scope.row)">
-            type="text"
-            @click="handleEdit(scope.row)"
-          >
             编辑
           </el-button>
-          <el-button
+          <el-button type="text" @click="handleDelete(scope.row)">
-            type="text"
-            @click="handleDelete(scope.row)"
-          >
             删除
           </el-button>
         </template>
@@ -91,7 +45,8 @@ import DictionaryChildAddOrUpdateForm from './DictionaryChildAddOrUpdateForm'
 
 const searchDataDefault = () => {
   return {
-    parentId: ''
+    Asc: true,
+    SortField: 'ShowOrder',
   }
 }
 export default {
@@ -121,6 +76,17 @@ export default {
     this.getList()
   },
   methods: {
+    // 排序
+    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()
+    },
     handleChild(row) {
       this.drawerChild = true
       this.getDictionaryChildList(row.Id)
@@ -172,7 +138,8 @@ export default {
     // 获取匿名化配置信息
     getList() {
       this.loading = true
-      getDictionaryChildList(this.parent.Id).then(res => {
+      this.searchData.ParentId = this.parent.Id
+      getDictionaryChildList(this.searchData).then(res => {
         this.loading = false
         this.list = res.Result
       }).catch(() => { this.loading = false })
@@ -190,6 +157,4 @@ export default {
 }
 </script>
 
-<style scoped>
+<style scoped></style>
-
-</style>

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>

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>

src/views/dictionary/template/components/Anonymization.vue

@@ -43,6 +43,7 @@
       :data="list"
       stripe
       height="100"
+      @sort-change="handleSortByColumn"
     >
       <el-table-column type="index" width="60" />
       <!-- Group -->
@@ -50,6 +51,7 @@
         prop="Group"
         :label="$t('template:anonymization:label:group')"
         show-overflow-tooltip
+        sortable="custom"
       />
       <!-- Element -->
       <el-table-column
@@ -57,24 +59,28 @@
         :label="$t('template:anonymization:label:element')"
         show-overflow-tooltip
         min-width="110"
+        sortable="custom"
       />
       <!-- Tag Description -->
       <el-table-column
         prop="TagDescription"
         :label="$t('template:anonymization:label:tagDescription')"
         min-width="110"
+        sortable="custom"
       />
       <!-- Tag DescriptionCN -->
       <el-table-column
         prop="TagDescriptionCN"
         :label="$t('template:anonymization:label:tagDescriptionCN')"
         min-width="110"
+        sortable="custom"
       />
       <!-- Value Representation -->
       <el-table-column
         prop="ValueRepresentation"
         :label="$t('template:anonymization:label:valueRepresentation')"
         min-width="110"
+        sortable="custom"
       />
       <!-- Is Fixed -->
       <el-table-column :label="$t('template:anonymization:label:isFixed')" width="100">
@@ -92,6 +98,7 @@
         prop="ReplaceValue"
         :label="$t('template:anonymization:label:valueReplace')"
         min-width="110"
+        sortable="custom"
       />
       <!-- Is Enable -->
       <el-table-column :label="$t('template:anonymization:label:isEnable')" width="100" fixed="right">
@@ -139,7 +146,9 @@ const searchDataDefault = () => {
     IsAdd: false,
     TagDescriptionCN: '',
     PageIndex: 1,
-    PageSize: 500
+    PageSize: 500,
+    Asc: false,
+    SortField: ''
   }
 }
 export default {
@@ -159,6 +168,17 @@ export default {
     this.getList()
   },
   methods: {
+    // 排序
+    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()
+    },
     switchChange(event, item) {
       this.loading = true
       addOrUpdateSystemAnonymization(item).then(res => {

src/views/dictionary/template/components/CriterionDictionary.vue

@@ -5,151 +5,81 @@
       </div>
       <div>
         <!-- 配置 -->
-        <el-button
+        <el-button size="mini" type="primary" :disabled="isCompleteConfig" @click="handleAdd"
-          size="mini"
+          style="margin-right: 10px;">
-          type="primary"
-          :disabled="isCompleteConfig"
-          @click="handleAdd"
-          style="margin-right: 10px;"
-        >
           {{ $t('dictionary:template:criterionDictionary:button:config') }}
         </el-button>
       </div>
     </div>
-    <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="" width="50">
-        prop=""
-        label=""
-        width="50"
-      >
         <template slot-scope="scope">
-          {{scope.$index + 1}}
+          {{ scope.$index + 1 }}
         </template>
       </el-table-column>
       <!-- 字典表名 -->
-      <el-table-column
+      <el-table-column prop="Code" :label="$t('dictionary:template:criterionDictionary:table:code')"
-        prop="Code"
+        show-overflow-tooltip>
-        :label="$t('dictionary:template:criterionDictionary:table:code')"
-        show-overflow-tooltip
-      >
       </el-table-column>
       <!-- 描述 -->
-      <el-table-column
+      <el-table-column prop="Description" :label="$t('dictionary:template:criterionDictionary:table:description')"
-        prop="Description"
+        show-overflow-tooltip>
-        :label="$t('dictionary:template:criterionDictionary:table:description')"
-        show-overflow-tooltip
-      >
       </el-table-column>
       <!-- 子项数量 -->
-      <el-table-column
+      <el-table-column prop="Count" :label="$t('dictionary:template:criterionDictionary:table:count')"
-        prop="Count"
+        show-overflow-tooltip>
-        :label="$t('dictionary:template:criterionDictionary:table:count')"
-        show-overflow-tooltip
-      >
       </el-table-column>
       <!-- 排序 -->
-      <el-table-column
+      <el-table-column prop="ShowOrder" :label="$t('dictionary:template:criterionDictionary:table:showOrder')"
-        prop="ShowOrder"
+        show-overflow-tooltip>
-        :label="$t('dictionary:template:criterionDictionary:table:showOrder')"
-        show-overflow-tooltip
-      >
       </el-table-column>
       <!-- 操作 -->
-      <el-table-column
+      <el-table-column prop="Description" :label="$t('common:action:action')" show-overflow-tooltip>
-        prop="Description"
-        :label="$t('common:action:action')"
-        show-overflow-tooltip
-      >
         <template slot-scope="scope">
           <!-- 配置 -->
-          <el-button :disabled="isCompleteConfig" type="text" @click="openChildren(scope.row)">
+          <el-button type="text" @click="openChildren(scope.row)">
             {{ $t('dictionary:template:criterionDictionary:button:config') }}
           </el-button>
           <!-- 删除 -->
-          <el-button
+          <el-button type="text" :disabled="isCompleteConfig" @click="handleDelete(scope.row)">
-            type="text"
-            :disabled="isCompleteConfig"
-            @click="handleDelete(scope.row)"
-          >
             {{ $t('common:button:delete') }}
           </el-button>
         </template>
       </el-table-column>
     </el-table>
-    <el-drawer
+    <el-drawer :title="drawer_cfg.title" :append-to-body="true" :modal-append-to-body="false"
-      :title="drawer_cfg.title"
+      :visible.sync="drawer_cfg.drawerChild" direction="rtl" size="80%">
-      :append-to-body="true"
+      <CriterionDictionaryConfig v-if="drawer_cfg.drawerChild" @getList="getList" :isCompleteConfig="isCompleteConfig"
-      :modal-append-to-body="false"
+        :criterionId="criterionId" :parentCode="drawer_cfg.title"></CriterionDictionaryConfig>
-      :visible.sync="drawer_cfg.drawerChild"
-      direction="rtl"
-      size="80%"
-    >
-      <CriterionDictionaryConfig v-if="drawer_cfg.drawerChild" @getList="getList" :criterionId="criterionId" :parentCode="drawer_cfg.title"></CriterionDictionaryConfig>
     </el-drawer>
-    <el-drawer
+    <el-drawer :title="drawer_cfg2.title" :append-to-body="true" :modal-append-to-body="false"
-      :title="drawer_cfg2.title"
+      :visible.sync="drawer_cfg2.drawerChild" direction="rtl" size="80%">
-      :append-to-body="true"
-      :modal-append-to-body="false"
-      :visible.sync="drawer_cfg2.drawerChild"
-      direction="rtl"
-      size="80%"
-    >
       <div style="text-align: right;">
-        <el-button
+        <el-button size="mini" type="primary" @click="handleSave" v-loading="loading">
-          size="mini"
+          {{ $t('common:button:save') }}
-          type="primary"
-          @click="handleSave"
-          v-loading="loading"
-        >
-          {{ $t('common:button:save')}}
         </el-button>
       </div>
-      <el-table
+      <el-table v-loading="loading" v-adaptive="{ bottomOffset: 0 }" height="100" ref="multipleTable" style="width: 100%"
-        v-loading="loading"
+        :data="dicList" stripe @selection-change="handleSelectionChange">
-        v-adaptive="{bottomOffset:0}"
+        <el-table-column type="selection" width="55">
-        height="100"
-        ref="multipleTable"
-        style="width: 100%"
-        :data="dicList"
-        stripe
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column
-          type="selection"
-          width="55">
         </el-table-column>
-        <el-table-column
+        <el-table-column width="55">
-          width="55">
           <template slot-scope="scope">
-            {{ scope.$index + 1}}
+            {{ scope.$index + 1 }}
           </template>
         </el-table-column>
         <!-- 字典表名 -->
-        <el-table-column
+        <el-table-column prop="Code" :label="$t('dictionary:template:criterionDictionary:table:code')"
-          prop="Code"
+          show-overflow-tooltip>
-          :label="$t('dictionary:template:criterionDictionary:table:code')"
-          show-overflow-tooltip
-        >
         </el-table-column>
         <!-- 描述 -->
-        <el-table-column
+        <el-table-column prop="Description" :label="$t('dictionary:template:criterionDictionary:table:description')"
-          prop="Description"
+          show-overflow-tooltip>
-          :label="$t('dictionary:template:criterionDictionary:table:description')"
-          show-overflow-tooltip
-        >
         </el-table-column>
         <!-- 排序 -->
-        <el-table-column
+        <el-table-column prop="ShowOrder" :label="$t('dictionary:template:criterionDictionary:table:showOrder')"
-          prop="ShowOrder"
+          show-overflow-tooltip>
-          :label="$t('dictionary:template:criterionDictionary:table:showOrder')"
-          show-overflow-tooltip
-        >
         </el-table-column>
       </el-table>
     </el-drawer>
@@ -264,7 +194,7 @@ export default {
       this.loading = true
       // 是否确认删除
       this.$confirm(this.$t('template:criterionDictionary:message:msg1')).then(() => {
-        deleteSystemCriterionDictionary({Id: row.Id}).then(res => {
+        deleteSystemCriterionDictionary({ Id: row.Id }).then(res => {
           this.$message.success(this.$t('common:message:deletedSuccessfully'))
           this.loading = false
           this.getList()
@@ -277,7 +207,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-::v-deep .el-form-item__content{
+::v-deep .el-form-item__content {
   width: calc(100% - 110px);
 }
 </style>

src/views/dictionary/template/components/CriterionDictionaryConfig.vue

@@ -4,134 +4,74 @@
       <div>
       </div>
       <div>
-        <el-button
+        <el-button size="mini" type="primary" @click="handleAdd" style="margin-right: 10px;" v-if="!isCompleteConfig">
-          size="mini"
-          type="primary"
-          @click="handleAdd"
-          style="margin-right: 10px;"
-        >
           {{ $t('dictionary:template:criterionDictionary:button:config') }}
         </el-button>
       </div>
     </div>
-    <el-table
+    <el-table v-loading="loading" v-adaptive="{ bottomOffset: 0 }" height="100" style="width: 100%" :data="list" stripe>
-      v-loading="loading"
+      <el-table-column prop="" label="" width="50">
-      v-adaptive="{bottomOffset:0}"
-      height="100"
-      style="width: 100%"
-      :data="list"
-      stripe
-    >
-      <el-table-column
-        prop=""
-        label=""
-        width="50"
-      >
         <template slot-scope="scope">
-          {{scope.$index + 1}}
+          {{ scope.$index + 1 }}
         </template>
       </el-table-column>
       <!-- 键值 -->
-      <el-table-column
+      <el-table-column prop="Code" :label="$t('dictionary:template:criterionDictionary:table:code')"
-        prop="Code"
+        show-overflow-tooltip />
-        :label="$t('dictionary:template:criterionDictionary:table:code')"
-        show-overflow-tooltip
-      />
       <!-- 中文值 -->
-      <el-table-column
+      <el-table-column prop="ValueCN" :label="$t('dictionary:template:criterionDictionary:table:valueCN')"
-        prop="ValueCN"
+        show-overflow-tooltip>
-        :label="$t('dictionary:template:criterionDictionary:table:valueCN')"
-        show-overflow-tooltip
-      >
       </el-table-column>
       <!-- 英文值 -->
-      <el-table-column
+      <el-table-column prop="Value" :label="$t('dictionary:template:criterionDictionary:table:value')"
-        prop="Value"
+        show-overflow-tooltip>
-        :label="$t('dictionary:template:criterionDictionary:table:value')"
-        show-overflow-tooltip
-      >
       </el-table-column>
       <!-- 描述 -->
-      <el-table-column
+      <el-table-column prop="Description" :label="$t('dictionary:template:criterionDictionary:table:description')"
-        prop="Description"
+        show-overflow-tooltip>
-        :label="$t('dictionary:template:criterionDictionary:table:description')"
-        show-overflow-tooltip
-      >
       </el-table-column>
       <!-- 分组 -->
-      <el-table-column
+      <el-table-column prop="Description" :label="$t('dictionary:template:criterionDictionary:table:group')"
-        prop="Description"
+        show-overflow-tooltip>
-        :label="$t('dictionary:template:criterionDictionary:table:group')"
-        show-overflow-tooltip
-      >
         <template slot-scope="scope">
-          <div>
+          <div v-if="!isCompleteConfig">
-            <el-radio-group v-model="scope.row.CrterionDictionaryGroup" @change="(v) => {crterionDictionaryGroupChange(v, scope.row)}" size="mini">
+            <el-radio-group v-model="scope.row.CrterionDictionaryGroup"
-              <el-radio-button v-for="item of $d.CrterionDictionaryGroup" :label="item.value" :key="item.id">{{item.label}}</el-radio-button>
+              @change="(v) => { crterionDictionaryGroupChange(v, scope.row) }" size="mini">
+              <el-radio-button v-for="item of $d.CrterionDictionaryGroup" :label="item.value" :key="item.id">{{
+                item.label }}</el-radio-button>
             </el-radio-group>
           </div>
+          <div v-else>{{ $fd('CrterionDictionaryGroup', scope.row.CrterionDictionaryGroup) }}</div>
         </template>
       </el-table-column>
     </el-table>
-    <el-dialog
+    <el-dialog v-if="config.visible" :visible.sync="config.visible" :close-on-click-modal="false" :title="config.title"
-      v-if="config.visible"
+      width="90%" append-to-body>
-      :visible.sync="config.visible"
-      :close-on-click-modal="false"
-      :title="config.title"
-      width="90%"
-      append-to-body
-    >
       <div>
         <div style="text-align: right;">
-          <el-button
+          <el-button size="mini" type="primary" @click="handleSave" v-loading="loading">
-            size="mini"
+            {{ $t('common:button:save') }}
-            type="primary"
-            @click="handleSave"
-            v-loading="loading"
-          >
-            {{ $t('common:button:save')}}
           </el-button>
         </div>
-        <el-table
+        <el-table v-loading="loading" v-adaptive="{ bottomOffset: 100 }" height="100" ref="multipleTable"
-          v-loading="loading"
+          :data="$d[parentCode]" stripe @selection-change="handleSelectionChange">
-          v-adaptive="{bottomOffset:100}"
+          <el-table-column type="selection" width="55">
-          height="100"
-          ref="multipleTable"
-          :data="$d[parentCode]"
-          stripe
-          @selection-change="handleSelectionChange"
-        >
-          <el-table-column
-            type="selection"
-            width="55">
           </el-table-column>
           <!-- 键值 -->
-          <el-table-column
+          <el-table-column prop="raw.Code" :label="$t('dictionary:template:criterionDictionary:table:code')"
-            prop="raw.Code"
+            show-overflow-tooltip>
-            :label="$t('dictionary:template:criterionDictionary:table:code')"
-            show-overflow-tooltip
-          >
           </el-table-column>
           <!-- 中文值 -->
-          <el-table-column
+          <el-table-column prop="raw.ValueCN" :label="$t('dictionary:template:criterionDictionary:table:valueCN')"
-            prop="raw.ValueCN"
+            show-overflow-tooltip>
-            :label="$t('dictionary:template:criterionDictionary:table:valueCN')"
-            show-overflow-tooltip
-          >
           </el-table-column>
           <!-- 英文值 -->
-          <el-table-column
+          <el-table-column prop="raw.Value" :label="$t('dictionary:template:criterionDictionary:table:value')"
-            prop="raw.Value"
+            show-overflow-tooltip>
-            :label="$t('dictionary:template:criterionDictionary:table:value')"
-            show-overflow-tooltip
-          >
           </el-table-column>
           <!-- 描述 -->
-          <el-table-column
+          <el-table-column prop="raw.Description"
-            prop="raw.Description"
+            :label="$t('dictionary:template:criterionDictionary:table:description')" show-overflow-tooltip>
-            :label="$t('dictionary:template:criterionDictionary:table:description')"
-            show-overflow-tooltip
-          >
           </el-table-column>
         </el-table>
       </div>
@@ -150,6 +90,10 @@ export default {
     parentCode: {
       type: String,
       required: true
+    },
+    isCompleteConfig: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -178,7 +122,7 @@ export default {
         this.loading = false
         this.$message.success(this.$t('common:message:savedSuccessfully'))
         this.getList()
-      }).catch(() => {this.loading = false})
+      }).catch(() => { this.loading = false })
     },
     toggleSelection(rows) {
       console.log(this.$refs.multipleTable)
@@ -240,7 +184,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-::v-deep .el-form-item__content{
+::v-deep .el-form-item__content {
   width: calc(100% - 110px);
 }
 </style>

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,

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>
-
-

src/views/dictionary/template/components/IncreaseFields.vue

@@ -43,6 +43,7 @@
       :data="list"
       stripe
       height="100"
+      @sort-change="handleSortByColumn"
     >
       <el-table-column type="index" width="60" />
       <!-- Group -->
@@ -50,6 +51,7 @@
         prop="Group"
         :label="$t('template:anonymization:label:group')"
         show-overflow-tooltip
+        sortable="custom"
       />
       <!-- Element -->
       <el-table-column
@@ -57,24 +59,28 @@
         :label="$t('template:anonymization:label:element')"
         show-overflow-tooltip
         min-width="110"
+        sortable="custom"
       />
       <!-- Tag Description -->
       <el-table-column
         prop="TagDescription"
         :label="$t('template:anonymization:label:tagDescription')"
         min-width="110"
+        sortable="custom"
       />
       <!-- Tag DescriptionCN -->
       <el-table-column
         prop="TagDescriptionCN"
         :label="$t('template:anonymization:label:tagDescriptionCN')"
         min-width="110"
+        sortable="custom"
       />
       <!-- Value Representation -->
       <el-table-column
         prop="ValueRepresentation"
         :label="$t('template:anonymization:label:valueRepresentation')"
         min-width="110"
+        sortable="custom"
       />
       <!-- Is Fixed -->
       <el-table-column :label="$t('template:anonymization:label:isFixed')" width="100">
@@ -92,6 +98,7 @@
         prop="ReplaceValue"
         :label="$t('template:anonymization:label:valueReplace')"
         min-width="110"
+        sortable="custom"
       />
       <!-- Is Enable -->
       <el-table-column :label="$t('template:anonymization:label:isEnable')" width="100" fixed="right">
@@ -138,7 +145,9 @@ const searchDataDefault = () => {
     TagDescriptionCN: '',
     IsAdd: true,
     PageIndex: 1,
-    PageSize: 500
+    PageSize: 500,
+    Asc: false,
+    SortField: ''
   }
 }
 export default {
@@ -158,6 +167,17 @@ export default {
     this.getList()
   },
   methods: {
+    // 排序
+    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()
+    },
     switchChange(event, item) {
       this.loading = true
       addOrUpdateSystemAnonymization(item).then(res => {

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>

src/views/dictionary/template/components/MedicalAudit.vue

@@ -30,13 +30,13 @@
         <el-form-item
           :label="$t('trials:auditRecord:table:criterion')"
         >
-          <el-select v-model="searchData.CriterionTypeEnum">
+          <el-select v-model="searchData.CriterionTypeEnum" clearable>
             <el-option v-for="item of $d.CriterionType" :key="item.id" :value="item.value" :label="item.label" />
           </el-select>
         </el-form-item>
         <!-- 是否通用 -->
         <el-form-item :label="$t('dictionary:medicalAudit:label:IsGeneral')">
-          <el-select v-model="searchData.IsGeneral">
+          <el-select v-model="searchData.IsGeneral" clearable>
             <el-option v-for="item of $d.YesOrNo" :key="item.id" :value="item.value" :label="item.label" />
           </el-select>
         </el-form-item>
@@ -51,6 +51,9 @@
           >
             {{ $t('common:button:reset') }}
           </el-button>
+          <el-button type="primary" @click="handleExport">
+            {{ $t('common:button:export') }}
+          </el-button>
         </el-form-item>
       </el-form>
       <span style="margin-left:auto">
@@ -66,6 +69,7 @@
       :data="list"
       stripe
       height="100"
+      @sort-change="handleSortByColumn"
     >
       <!-- 序号 -->
       <el-table-column
@@ -79,6 +83,7 @@
         :label="$t('trials:MIMqcCfg:table:questionName')"
         show-overflow-tooltip
         min-width="140"
+        sortable="custom"
       />
       <!-- 审核问题 -->
       <el-table-column
@@ -86,6 +91,7 @@
         :label="$t('common:title:languageType')"
         show-overflow-tooltip
         min-width="160"
+        sortable="custom"
       >
         <template slot-scope="scope">
           {{ $fd('LanguageType', scope.row.LanguageType) }}
@@ -97,6 +103,7 @@
         :label="$t('trials:qcCfg:table:type')"
         show-overflow-tooltip
         min-width="140"
+        sortable="custom"
       >
         <template slot-scope="scope">
           {{ $fd('QcType', scope.row.Type) }}
@@ -108,6 +115,7 @@
         :label="$t('trials:qcCfg:table:typeValue')"
         show-overflow-tooltip
         min-width="140"
+        sortable="custom"
       />
       <!-- 任务类型 -->
       <el-table-column
@@ -115,6 +123,7 @@
         :label="$t('trials:medicalFeedbackCfg:title:taskType')"
         show-overflow-tooltip
         min-width="140"
+        sortable="custom"
       >
         <template slot-scope="scope">
           <el-tag v-if="scope.row.ReadingCategory === 1" type="primary">
@@ -136,6 +145,7 @@
         :label="$t('trials:auditRecord:table:criterion')"
         min-width="160"
         show-overflow-tooltip
+        sortable="custom"
       >
         <template slot-scope="scope">
          <div>
@@ -148,6 +158,7 @@
         :label="$t('dictionary:medicalAudit:label:IsGeneral')"
         min-width="120"
         show-overflow-tooltip
+        sortable="custom"
       >
         <template slot-scope="scope">
           <div>
@@ -161,6 +172,7 @@
         :label="$t('trials:qcCfg:table:parentQs')"
         show-overflow-tooltip
         min-width="140"
+        sortable="custom"
       />
       <!-- 父问题触发值 -->
       <el-table-column
@@ -168,12 +180,14 @@
         :label="$t('trials:qcCfg:table:parentTriggerValue')"
         show-overflow-tooltip
         min-width="160"
+        sortable="custom"
       />
       <!-- 是否必填 -->
       <el-table-column
         prop="IsRequired"
         :label="$t('trials:qcCfg:table:isRequired')"
         min-width="120"
+        sortable="custom"
       >
         <template slot-scope="scope">
           {{ $fd('YesOrNo', scope.row.IsRequired) }}
@@ -184,6 +198,7 @@
         prop="IsEnable"
         :label="$t('trials:qcCfg:table:isEnable')"
         min-width="120"
+        sortable="custom"
       >
         <template slot-scope="scope">
           {{ $fd('YesOrNo', scope.row.IsEnable) }}
@@ -215,7 +230,7 @@
 </template>
 <script>
 import { getReadingMedicineSystemQuestionList, deleteReadingMedicineSystemQuestion } from '@/api/dictionary'
-
+import { GetReadingMedicineSystemQuestionList_Export } from '@/api/export'
 import BoxContent from '@/components/BoxContent'
 import Pagination from '@/components/Pagination'
 import MedicalAuditForm from './MedicalAuditForm'
@@ -228,7 +243,9 @@ const searchDataDefault = () => {
     LanguageType: null,
     Type: '',
     CriterionTypeEnum: null,
-    IsGeneral: null
+    IsGeneral: null,
+    Asc: false,
+    SortField: ''
   }
 }
 export default {
@@ -248,6 +265,20 @@ export default {
     this.getList()
   },
   methods: {
+    async handleExport() {
+      await GetReadingMedicineSystemQuestionList_Export(this.searchData)
+    },
+    // 排序
+    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()
+    },
     // 获取受试者列表信息
     getList() {
       this.loading = true

src/views/dictionary/template/components/TableQsForm.vue

@@ -1,155 +1,86 @@
 <template>
-  <el-form
+  <el-form ref="tableQsForm" v-loading="loading" :model="form" size="small" :disabled="type === 'look'" :rules="rules"
-    ref="tableQsForm"
+    label-width="130px">
-    v-loading="loading"
-    :model="form"
-    size="small"
-    :disabled="type === 'look'"
-    :rules="rules"
-    label-width="130px"
-  >
     <div class="base-dialog-body" style="height: 550px; display:flex;flex-direction: column;">
       <div style="height: 150px;">
         <!-- 类型 -->
         <el-form-item :label="$t('trials:readingUnit:qsList:title:type')" prop="Type">
-          <el-select
+          <el-select v-model="form.Type" @change="((val) => { qsTypeChange(val, form) })">
-            v-model="form.Type"
+            <el-option v-for="item of $d.Criterion_Question_Type"
-            @change="((val)=>{qsTypeChange(val, form)})"
-          >
-            <el-option
-              v-for="item of $d.Criterion_Question_Type"
               v-show="item.value !== 'class' && item.value !== 'group' && item.value !== 'table' && item.value !== 'basicTable'"
-              :key="item.value"
+              :key="item.value" :value="item.value" :label="item.label" />
-              :value="item.value"
-              :label="item.label"
-            />
           </el-select>
         </el-form-item>
         <!-- 问题名称 -->
-        <el-form-item
+        <el-form-item v-if="form.Type !== 'group'" :label="$t('trials:readingUnit:qsList:title:qsNameEn')"
-          v-if="form.Type !== 'group'"
+          prop="QuestionName" :rules="[
-          :label="$t('trials:readingUnit:qsList:title:qsNameEn')"
-          prop="QuestionName"
-          :rules="[
             { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
             { max: form.Type === 'summary' ? 300 : 100, message: `${this.$t('common:ruleMessage:maxLength')} ${form.Type === 'summary' ? 300 : 100}` }
-          ]"
+          ]">
-        >
+          <el-input v-model="form.QuestionName" />
-          <el-input
-            v-model="form.QuestionName"
-          />
         </el-form-item>
         <!-- 问题名称（EN） -->
-        <el-form-item
+        <el-form-item v-if="form.Type !== 'group'" :label="$t('trials:readingUnit:qsList:title:qsNameEn')"
-          v-if="form.Type !== 'group'"
+          prop="QuestionEnName" :rules="[
-          :label="$t('trials:readingUnit:qsList:title:qsNameEn')"
-          prop="QuestionEnName"
-          :rules="[
             { max: form.Type === 'summary' ? 300 : 100, message: `${this.$t('common:ruleMessage:maxLength')} ${form.Type === 'summary' ? 300 : 100}` }
-          ]"
+          ]">
-        >
+          <el-input v-model="form.QuestionEnName" />
-          <el-input
-            v-model="form.QuestionEnName"
-          />
         </el-form-item>
       </div>
       <div style="flex: 1;overflow-y:auto;">
         <!-- 公有属性 -->
-        <el-divider content-position="left">{{$t('trials:readingUnit:title:publicProperties')}}</el-divider>
+        <el-divider content-position="left">{{ $t('trials:readingUnit:title:publicProperties') }}</el-divider>
         <!-- 是否显示 -->
-        <el-form-item v-if="form.Type !== 'group'" :label="$t('trials:readingUnit:qsList:title:isShow')" prop="ShowQuestion">
+        <el-form-item v-if="form.Type !== 'group'" :label="$t('trials:readingUnit:qsList:title:isShow')"
-          <el-radio-group
+          prop="ShowQuestion">
-            v-model="form.ShowQuestion"
+          <el-radio-group v-model="form.ShowQuestion" @change="((val) => { isShowQuestionChange(val, form) })">
-            @change="((val)=>{isShowQuestionChange(val, form)})"
+            <el-radio v-for="item of $d.ShowQuestion" :key="`ShowQuestion${item.value}`" :label="item.value">
-          >
-            <el-radio
-              v-for="item of $d.ShowQuestion"
-              :key="`ShowQuestion${item.value}`"
-              :label="item.value"
-            >
               {{ item.label }}
             </el-radio>
           </el-radio-group>
         </el-form-item>
 
         <!-- 显示时依赖父问题 -->
-        <el-form-item
+        <el-form-item v-if="form.Type !== 'group' && form.ShowQuestion === 1"
-          v-if="form.Type !== 'group' && form.ShowQuestion===1"
+          :label="$t('trials:readingUnit:qsList:title:parentId')" prop="ParentId">
-          :label="$t('trials:readingUnit:qsList:title:parentId')"
+          <el-select v-model="form.ParentId" clearable @change="((val) => { parentQuestionChange(val, form) })">
-          prop="ParentId"
+            <el-option v-for="item of parentOptions" :key="`ParentId${item.QuestionId}`" :label="item.QuestionName"
-        >
+              :value="item.QuestionId" />
-          <el-select
-            v-model="form.ParentId"
-            clearable
-            @change="((val)=>{parentQuestionChange(val, form)})"
-          >
-            <el-option
-              v-for="item of parentOptions"
-              :key="`ParentId${item.QuestionId}`"
-              :label="item.QuestionName"
-              :value="item.QuestionId"
-            />
           </el-select>
         </el-form-item>
         <!-- 显示时依赖父问题触发值 -->
-        <el-form-item v-if="form.ParentId && form.ShowQuestion===1" :label="$t('trials:readingUnit:qsList:title:parentTriggerValueList')"  prop="ParentTriggerValueList">
+        <el-form-item v-if="form.ParentId && form.ShowQuestion === 1"
+          :label="$t('trials:readingUnit:qsList:title:parentTriggerValueList')" prop="ParentTriggerValueList">
           <el-select v-model="form.ParentTriggerValueList" clearable multiple>
-            <el-option
+            <el-option v-for="item of parentTriggerValOptions" :key="item.id" :label="item.label"
-              v-for="item of parentTriggerValOptions"
+              :value="String(item.value)" />
-              :key="item.id"
-              :label="item.label"
-              :value="String(item.value)"
-            />
           </el-select>
         </el-form-item>
         <!-- 是否必填 -->
-        <el-form-item v-if="form.Type !== 'group' && form.Type !== 'table' && form.Type !== 'basicTable' && form.Type !== 'summary'" :label="$t('trials:readingUnit:qsList:title:isRequired')" prop="IsRequired">
+        <el-form-item
-          <el-radio-group
+          v-if="form.Type !== 'group' && form.Type !== 'table' && form.Type !== 'basicTable' && form.Type !== 'summary'"
-            v-model="form.IsRequired"
+          :label="$t('trials:readingUnit:qsList:title:isRequired')" prop="IsRequired">
-            :disabled="form.IsJudgeQuestion===true || form.ShowQuestion===2"
+          <el-radio-group v-model="form.IsRequired" :disabled="form.IsJudgeQuestion === true || form.ShowQuestion === 2"
-            @change="((val)=>{isRequiredChange(val, form)})"
+            @change="((val) => { isRequiredChange(val, form) })">
-          >
+            <el-radio v-for="item of $d.QuestionRequired" :key="`QuestionRequired${item.value}`" :label="item.value">
-            <el-radio
-              v-for="item of $d.QuestionRequired"
-              :key="`QuestionRequired${item.value}`"
-              :label="item.value"
-            >
               {{ item.label }}
             </el-radio>
           </el-radio-group>
         </el-form-item>
         <!-- 必填依赖父问题 -->
-        <el-form-item
+        <el-form-item v-if="form.Type !== 'group' && form.IsRequired === 1"
-          v-if="form.Type !== 'group' && form.IsRequired === 1"
+          :label="$t('trials:readingUnit:qsList:title:relevanceId')" prop="RelevanceId">
-          :label="$t('trials:readingUnit:qsList:title:relevanceId')"
+          <el-select v-model="form.RelevanceId" clearable @change="((val) => { relevanceQuestionChange(val, form) })">
-          prop="RelevanceId"
+            <el-option v-for="item of parentOptions" :key="`RelevanceId${item.QuestionId}`" :label="item.QuestionName"
-        >
+              :value="item.QuestionId" />
-          <el-select
-            v-model="form.RelevanceId"
-            clearable
-            @change="((val)=>{relevanceQuestionChange(val, form)})"
-          >
-            <el-option
-              v-for="item of parentOptions"
-              :key="`RelevanceId${item.QuestionId}`"
-              :label="item.QuestionName"
-              :value="item.QuestionId"
-            />
           </el-select>
         </el-form-item>
         <!-- 必填触发值 -->
-        <el-form-item
+        <el-form-item v-if="form.RelevanceId && form.IsRequired === 1"
-          v-if="form.RelevanceId && form.IsRequired === 1"
+          :label="$t('trials:readingUnit:qsList:title:relevanceValueList')" prop="RelevanceValueList">
-          :label="$t('trials:readingUnit:qsList:title:relevanceValueList')"
-          prop="RelevanceValueList"
-        >
           <el-select v-model="form.RelevanceValueList" clearable multiple>
-            <el-option
+            <el-option v-for="item of reParentTriggerValOptions" :key="item.id" :label="item.label"
-              v-for="item of reParentTriggerValOptions"
+              :value="String(item.value)" />
-              :key="item.id"
-              :label="item.label"
-              :value="String(item.value)"
-            />
           </el-select>
         </el-form-item>
         <!-- 导出标识 -->
@@ -174,175 +105,95 @@
           </el-radio-group>
         </el-form-item> -->
         <!-- 导出结果 -->
-        <el-form-item 
+        <el-form-item :label="$t('trials:readingUnit:qsList:title:ExportResult')"
-          :label="$t('trials:readingUnit:qsList:title:ExportResult')"
+          v-if="form.Type === 'radio' || form.Type === 'select' || form.Type === 'input' || form.Type === 'textarea' || form.Type === 'number' || form.Type === 'class' || form.Type === 'calculation'">
-          v-if="form.Type === 'radio' || form.Type === 'select' || form.Type === 'input' || form.Type === 'textarea' || form.Type === 'number' || form.Type === 'class' || form.Type === 'calculation'"
-        >
           <el-select v-model="form.ExportResult" multiple>
-            <el-option
+            <el-option v-for="item in CriterionDictionaryList.ExportResult" :key="`ExportResult${item.value}`"
-              v-for="item in CriterionDictionaryList.ExportResult"
+              :value="parseInt(item.Code)" :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value">
-              :key="`ExportResult${item.value}`"
-              :value="parseInt(item.Code)"
-              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
-            >
             </el-option>
           </el-select>
         </el-form-item>
         <!-- 限制编辑 -->
-        <el-form-item 
+        <el-form-item :label="$t('trials:readingUnit:qsList:title:limitEdit')" v-if="form.Type !== 'summary'"
-          :label="$t('trials:readingUnit:qsList:title:limitEdit')" 
+          prop="LimitEdit" :rules="[
-          v-if="form.Type !== 'summary'"
-          prop="LimitEdit"
-          :rules="[
             { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-          ]"
+          ]">
-        >
           <el-radio-group v-model="form.LimitEdit">
             <el-radio v-for="item of $d.LimitEdit" :key="item.value" :label="item.value">{{ item.label }}</el-radio>
           </el-radio-group>
         </el-form-item>
         <!-- 问题标识 -->
-        <el-form-item
+        <el-form-item v-if="form.Type !== 'group' && form.Type !== 'summary'"
-          v-if="form.Type !== 'group' && form.Type !== 'summary'"
+          :label="$t('dictionary:template:criterionConfig:table:questionMark')" prop="QuestionMark">
-          :label="$t('dictionary:template:criterionConfig:table:questionMark')"
+          <el-select v-model="form.QuestionMark" clearable>
-          prop="QuestionMark"
+            <el-option v-for="item of CriterionDictionaryList.QuestionMark" :key="item.Id" :value="parseInt(item.Code)"
-        >
+              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value" />
-          <el-select
-            v-model="form.QuestionMark"
-            clearable
-          >
-            <el-option
-              v-for="item of CriterionDictionaryList.QuestionMark"
-              :key="item.Id"
-              :value="parseInt(item.Code)"
-              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
-            />
           </el-select>
         </el-form-item>
         <!-- 注释 -->
-        <el-form-item
+        <el-form-item :label="$t('trials:readingUnit:qsList:title:Remark')" prop="Remark">
-          :label="$t('trials:readingUnit:qsList:title:Remark')"
-          prop="Remark"
-        >
           <el-input v-model="form.Remark" />
         </el-form-item>
         <!-- 序号 -->
-        <el-form-item 
+        <el-form-item :label="$t('trials:readingUnit:qsList:title:order')" prop="ShowOrder" :rules="[
-          :label="$t('trials:readingUnit:qsList:title:order')" 
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-          prop="ShowOrder"
+        ]">
-          :rules="[
+          <el-input-number v-model="form.ShowOrder" controls-position="right" :min="0" />
-            { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-          ]"
-        >
-          <el-input-number
-            v-model="form.ShowOrder"
-            controls-position="right"
-            :min="0"
-          />
         </el-form-item>
         <!-- 重复出现最大次数 -->
-        <el-form-item :label="$t('dictionary:template:criterionConfig:table:maxRowCount')" v-if="form.Type !== 'summary' && form.Type !== 'screenshot' && form.Type !== 'upload'">
+        <el-form-item :label="$t('dictionary:template:criterionConfig:table:maxRowCount')"
-          <el-input-number
+          v-if="form.Type !== 'summary' && form.Type !== 'screenshot' && form.Type !== 'upload'">
-            v-model="form.MaxRowCount"
+          <el-input-number v-model="form.MaxRowCount" controls-position="right" :min="0" :max="10" />
-            controls-position="right"
-            :min="0"
-            :max="10"
-          />
         </el-form-item>
         <!-- 问题分类 -->
-        <el-form-item :label="$t('dictionary:template:criterionConfig:table:questionClassify')" v-if="criterionType === 2">
+        <el-form-item :label="$t('dictionary:template:criterionConfig:table:questionClassify')"
+          v-if="criterionType === 2">
           <el-select v-model="form.QuestionClassify" clearable>
-            <el-option
+            <el-option v-for="item of $d.QuestionClassify" :key="item.id" :label="item.label" :value="item.value" />
-              v-for="item of $d.QuestionClassify"
-              :key="item.id"
-              :label="item.label"
-              :value="item.value"
-            />
           </el-select>
         </el-form-item>
         <!-- 私有属性 -->
-        <el-divider content-position="left">{{$t('trials:readingUnit:title:privateProperties')}}</el-divider>
+        <el-divider content-position="left">{{ $t('trials:readingUnit:title:privateProperties') }}</el-divider>
         <!-- 选项类型 -->
-        <el-form-item
+        <el-form-item v-if="form.Type === 'select' || form.Type === 'radio' || form.Type === 'input'"
-          v-if="form.Type === 'select' || form.Type === 'radio' || form.Type === 'input'"
+          :label="$t('trials:readingUnit:label:QuestionGenre')" prop="TableQuestionType" :rules="[
-          :label="$t('trials:readingUnit:label:QuestionGenre')"
+            { required: form.Type !== 'input', message: this.$t('common:ruleMessage:select') }
-          prop="TableQuestionType"
+          ]">
-          :rules="[
+          <el-radio-group v-model="form.TableQuestionType" @change="((val) => { tableQuestionTypeChange(val, form) })">
-            { required: form.Type !== 'input', message: this.$t('common:ruleMessage:select')}
+            <el-radio v-for="item of $d.TableQuestionType" :key="item.id" :label="item.value"
-          ]"
+              :disabled="(form.Type === 'radio' && (item.value === 1 || item.value === 2)) || (form.Type === 'input' && (item.value === 0 || item.value === 3))">
-        >
-          <el-radio-group
-            v-model="form.TableQuestionType"
-            @change="((val)=>{tableQuestionTypeChange(val, form)})"
-          >
-            <el-radio
-              v-for="item of $d.TableQuestionType"
-              :key="item.id"
-              :label="item.value"
-              :disabled="(form.Type === 'radio' && (item.value===1 || item.value===2)) || (form.Type === 'input' && (item.value===0 || item.value===3))"
-            >
               {{ item.label }}
             </el-radio>
           </el-radio-group>
         </el-form-item>
         <!-- 选项 -->
-        <el-form-item
+        <el-form-item v-if="form.TableQuestionType === 0 || form.Type === 'class'"
-          v-if="form.TableQuestionType === 0  || form.Type === 'class'"
+          :label="$t('trials:qcCfg:table:typeValue')" prop="TypeValue">
-          :label="$t('trials:qcCfg:table:typeValue')"
+          <el-input v-model="form.TypeValue" :placeholder="$t('trials:qcCfg:message:typeValue')"
-          prop="TypeValue"
+            @change="typeValueChange" />
-        >
-          <el-input
-            v-model="form.TypeValue"
-            :placeholder="$t('trials:qcCfg:message:typeValue')"
-            @change="typeValueChange"
-          />
         </el-form-item>
         <!-- 关联问题 -->
-        <el-form-item
+        <el-form-item v-if="form.TableQuestionType === 2"
-          v-if="form.TableQuestionType === 2"
+          :label="$t('dictionary:template:criterionConfig:table:dependParentId')" prop="DependParentId">
-          :label="$t('dictionary:template:criterionConfig:table:dependParentId')"
+          <el-select v-model="form.DependParentId">
-          prop="DependParentId"
+            <el-option v-for="item of parentOptions" :key="`DependParentId${item.QuestionId}`"
-        >
+              :label="item.QuestionName" :value="item.QuestionId" />
-          <el-select
-            v-model="form.DependParentId"
-          >
-            <el-option
-              v-for="item of parentOptions"
-              :key="`DependParentId${item.QuestionId}`"
-              :label="item.QuestionName"
-              :value="item.QuestionId"
-            />
           </el-select>
         </el-form-item>
         <!-- 关联字段 -->
-        <el-form-item
+        <el-form-item v-if="form.TableQuestionType === 1 || !!form.DependParentId"
-          v-if="form.TableQuestionType === 1 || !!form.DependParentId"
+          :label="$t('dictionary:template:criterionConfig:table:dataTableColumn')" prop="DataTableColumn">
-          :label="$t('dictionary:template:criterionConfig:table:dataTableColumn')"
-          prop="DataTableColumn"
-        >
           <el-select v-model="form.DataTableColumn">
-            <el-option
+            <el-option v-for="item of CriterionDictionaryList.OrganColumn" :key="item.Id"
-              v-for="item of CriterionDictionaryList.OrganColumn"
+              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value" :value="item.Code" />
-              :key="item.Id"
-              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
-              :value="item.Code"
-            />
           </el-select>
         </el-form-item>
         <!-- 关联字典 -->
-        <el-form-item
+        <el-form-item v-if="form.TableQuestionType === 3 || form.TableQuestionType === 2"
-          v-if="form.TableQuestionType === 3 || form.TableQuestionType === 2"
+          :label="$t('dictionary:template:criterionConfig:table:relatedDictionaryCode')" prop="DictionaryCode"
-          :label="$t('dictionary:template:criterionConfig:table:relatedDictionaryCode')"
+          :rules="[{ required: form.TableQuestionType === 3, message: '请选择', trigger: 'blur' }]">
-          prop="DictionaryCode"
-          :rules="[{ required: form.TableQuestionType === 3, message: '请选择', trigger: 'blur' }]"
-        >
           <el-select v-model="form.DictionaryCode">
-            <el-option
+            <el-option v-for="item of dicList" :key="item.Id" :label="item.Code" :value="item.Code" />
-              v-for="item of dicList"
-              :key="item.Id"
-              :label="item.Code"
-              :value="item.Code"
-            />
           </el-select>
         </el-form-item>
         <!-- 默认值 -->
@@ -354,35 +205,23 @@
               :label="item.label"
               :value="item.value.toString()"
             /> -->
-            <el-option
+            <el-option v-for="item of highlightAnswers" :key="item.Id"
-              v-for="item of highlightAnswers"
+              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value" :value="item.Code" />
-              :key="item.Id"
-              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
-              :value="item.Code"
-            />
           </el-select>
         </el-form-item>
         <!-- 默认值 -->
         <el-form-item v-if="form.TableQuestionType === 0" :label="$t('trials:readingUnit:qsList:title:defaultValue')">
           <el-select v-model="form.DefaultValue" clearable>
-            <el-option
+            <el-option v-for="item of form.TypeValue ? form.TypeValue.split('|') : []" :key="item" :label="item"
-              v-for="item of form.TypeValue ? form.TypeValue.split('|') : []"
+              :value="item" />
-              :key="item"
-              :label="item"
-              :value="item"
-            />
           </el-select>
         </el-form-item>
         <!-- 高亮标记值 -->
-        <el-form-item v-if="form.Type === 'select' || form.Type === 'radio'" :label="$t('trials:readingUnit:qsList:title:highlightAnswers')" prop="HighlightAnswerList">
+        <el-form-item v-if="form.Type === 'select' || form.Type === 'radio' || form.Type === 'calculation'"
+          :label="$t('trials:readingUnit:qsList:title:highlightAnswers')" prop="HighlightAnswerList">
           <el-select v-model="form.HighlightAnswerList" clearable multiple>
             <template v-if="form.TypeValue">
-              <el-option
+              <el-option v-for="item of form.TypeValue.split('|')" :key="item" :label="item" :value="item" />
-                v-for="item of form.TypeValue.split('|')"
-                :key="item"
-                :label="item"
-                :value="item"
-              />
             </template>
             <template v-else-if="form.DictionaryCode">
               <!-- <el-option
@@ -391,24 +230,16 @@
                 :label="item.label"
                 :value="item.value.toString()"
               /> -->
-              <el-option
+              <el-option v-for="item of highlightAnswers" :key="item.Id"
-                v-for="item of highlightAnswers"
+                :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value" :value="item.Code" />
-                :key="item.Id"
-                :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
-                :value="item.Code"
-              />
             </template>
           </el-select>
         </el-form-item>
         <!-- 最大长度 -->
-        <el-form-item 
+        <el-form-item v-if="form.Type === 'input' || form.Type === 'textarea'"
-          v-if="form.Type === 'input' || form.Type === 'textarea'"
+          :label="$t('trials:readingUnit:qsList:title:MaxAnswerLength')" prop="MaxAnswerLength" :rules="[
-          :label="$t('trials:readingUnit:qsList:title:MaxAnswerLength')"
-          prop="MaxAnswerLength"
-          :rules="[
             { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }
-          ]"
+          ]">
-        >
           <el-input-number v-model="form.MaxAnswerLength" :min="0"></el-input-number>
         </el-form-item>
         <!-- 是否复制前值 -->
@@ -425,138 +256,82 @@
           />
         </el-form-item> -->
         <!-- 数值类型 -->
-        <el-form-item
+        <el-form-item v-if="form.Type === 'number' || form.Type === 'calculation'"
-          v-if="form.Type === 'number' || form.Type === 'calculation'"
+          :label="$t('trials:readingUnit:qsList:title:valueType')" prop="ValueType" :rules="[
-          :label="$t('trials:readingUnit:qsList:title:valueType')"
-          prop="ValueType"
-          :rules="[
             { required: true, message: this.$t('common:ruleMessage:select') }
-          ]"
+          ]">
-        >
+          <el-radio-group v-model="form.ValueType">
-          <el-radio-group
+            <el-radio v-for="item of $d.ValueType" :key="item.id" :label="item.value">
-            v-model="form.ValueType"
-          >
-            <el-radio
-              v-for="item of $d.ValueType"
-              :key="item.id"
-              :label="item.value"
-            >
               {{ item.label }}
             </el-radio>
           </el-radio-group>
         </el-form-item>
 
         <!-- 单位 -->
-        <el-form-item
+        <el-form-item v-if="form.Type === 'number' || form.Type === 'calculation'"
-          v-if="form.Type === 'number' || form.Type === 'calculation'"
+          :label="$t('trials:readingUnit:qsList:title:unit')" prop="Unit" :rules="[
-          :label="$t('trials:readingUnit:qsList:title:unit')"
-          prop="Unit"
-          :rules="[
             { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-          ]"
+          ]">
-        >
+          <el-radio-group v-model="form.Unit">
-          <el-radio-group
+            <el-radio v-for="item of $d.ValueUnit" :key="item.id" :label="item.value">
-            v-model="form.Unit"
-          >
-            <el-radio
-              v-for="item of $d.ValueUnit"
-              :key="item.id"
-              :label="item.value"
-            >
               {{ item.label }}
             </el-radio>
           </el-radio-group>
         </el-form-item>
+        <!-- 图表展示-->
+        <el-form-item v-if="form.Type === 'number' || form.Type === 'calculation'"
+          :label="$t('trials:readingUnit:qsList:title:ShowChartTypeEnum')" prop="ShowChartTypeEnum">
+          <el-radio-group v-model="form.ShowChartTypeEnum">
+            <el-radio v-for="item of $d.ShowChartType" :key="item.id" :label="item.value">{{ item.label }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
         <!-- 最大上传个数 -->
-        <el-form-item 
+        <el-form-item v-if="form.Type === 'upload'" :label="$t('trials:readingUnit:qsList:title:imageCount')"
-          v-if="form.Type === 'upload'" 
+          prop="ImageCount">
-          :label="$t('trials:readingUnit:qsList:title:imageCount')"
+          <el-input-number v-model="form.ImageCount" controls-position="right" :min="0" :max="10" />
-          prop="ImageCount"
-        >
-          <el-input-number
-            v-model="form.ImageCount"
-            controls-position="right"
-            :min="0"
-            :max="10"
-          />
         </el-form-item>
         <!-- 文件类型 -->
-        <el-form-item 
+        <el-form-item v-if="form.Type === 'upload'" :label="$t('trials:readingUnit:qsList:title:FileType')"
-          v-if="form.Type === 'upload'" 
-          :label="$t('trials:readingUnit:qsList:title:FileType')"
           prop="FileType"
-          :rules="[{ type: 'array', required: true, message: this.$t('common:ruleMessage:specify'), trigger: [ 'change'] }]"
+          :rules="[{ type: 'array', required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['change'] }]">
-        >
+          <el-checkbox-group v-model="form.FileType" @change="(v) => {
-          <el-checkbox-group
+            if (v && v.includes('-1')) {
-            v-model="form.FileType"
+              form.FileType = ['-1']
-            @change="(v) => {
+            }
-              if (v && v.includes('-1')) {
+          }">
-                form.FileType = ['-1']
+            <el-checkbox v-for="item of $d.fileType" :key="`fileType${item.value}`" :value="item.value + ''"
-              }
+              :label="item.value" :disabled="form.FileType && form.FileType.includes('-1') && item.value !== '-1'">
-            }"
-          >
-            <el-checkbox
-              v-for="item of $d.fileType"
-              :key="`fileType${item.value}`"
-              :value="item.value + ''"
-              :label="item.value"
-              :disabled="form.FileType && form.FileType.includes('-1') && item.value !== '-1'"
-            >
               {{ item.label }}
             </el-checkbox>
           </el-checkbox-group>
         </el-form-item>
         <!-- 分类 -->
         <!-- 分类数据来源 -->
-        <el-form-item
+        <el-form-item v-if="form.Type === 'class'"
-          v-if="form.Type === 'class'"
+          :label="$t('dictionary:template:criterionConfig:table:classifyQuestion')" prop="ClassifyTableQuestionId">
-          :label="$t('dictionary:template:criterionConfig:table:classifyQuestion')"
-          prop="ClassifyTableQuestionId"
-        >
           <el-select v-model="form.ClassifyTableQuestionId" clearable>
-            <el-option v-for="item of Questions" :key="item.Id" :label="item.QuestionName"
+            <el-option v-for="item of Questions" :key="item.Id" :label="item.QuestionName" :value="item.Id" />
-                      :value="item.Id"/>
           </el-select>
         </el-form-item>
         <!-- 分类算法 -->
-        <el-form-item
+        <el-form-item v-if="form.Type === 'class'"
-          v-if="form.Type === 'class'"
+          :label="$t('dictionary:template:criterionConfig:table:classifyAlgorithms')" prop="ClassifyAlgorithms">
-          :label="$t('dictionary:template:criterionConfig:table:classifyAlgorithms')"
-          prop="ClassifyAlgorithms"
-        >
           <div>
-            <el-table
+            <el-table ref="CalculateTable" :data="ClassifyAlgorithmsList" style="margin: 10px;width: 100%" size="small">
-              ref="CalculateTable"
-              :data="ClassifyAlgorithmsList"
-              style="margin: 10px;width: 100%"
-              size="small"
-            >
               <!-- 运算类型 -->
-              <el-table-column
+              <el-table-column :label="$t('trials:readingUnit:label:label')" show-overflow-tooltip min-width="70">
-                :label="$t('trials:readingUnit:label:label')"
-                show-overflow-tooltip
-                min-width="70"
-              >
                 <template slot-scope="scope">
                   {{ scope.row.label }}
                 </template>
               </el-table-column>
               <!-- 运算类型 -->
-              <el-table-column
+              <el-table-column :label="$t('trials:readingUnit:label:gt')" show-overflow-tooltip min-width="128">
-                :label="$t('trials:readingUnit:label:gt')"
-                show-overflow-tooltip
-                min-width="128"
-              >
                 <template slot-scope="scope">
                   <el-input-number v-model="scope.row.gt"></el-input-number>
                 </template>
               </el-table-column>
               <!-- 运算类型 -->
-              <el-table-column
+              <el-table-column :label="$t('trials:readingUnit:label:lt')" show-overflow-tooltip min-width="128">
-                :label="$t('trials:readingUnit:label:lt')"
-                show-overflow-tooltip
-                min-width="128"
-              >
                 <template slot-scope="scope">
                   <el-input-number v-model="scope.row.lt"></el-input-number>
                 </template>
@@ -569,11 +344,7 @@
     <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
       <el-form-item>
         <!-- 取消 -->
-        <el-button
+        <el-button size="small" type="primary" @click="close">
-          size="small"
-          type="primary"
-          @click="close"
-        >
           {{ $t('common:button:cancel') }}
         </el-button>
         <!-- 保存 -->
@@ -666,7 +437,8 @@ export default {
         ClassifyAlgorithms: null,
         // ExportIdentification: 0,
         ExportResult: [],
-        DefaultValue:null
+        DefaultValue: null,
+        ShowChartTypeEnum: 0
         // IsEnable: true
       },
       rules: {
@@ -677,8 +449,8 @@ export default {
         //   { max: 300, message: '最大长度为 300' }],
 
         TypeValue: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
-          { validator: validateTypeVal, trigger: 'blur' },
+        { validator: validateTypeVal, trigger: 'blur' },
-          { max: 200, message: `${this.$t('common:ruleMessage:maxLength')} 200` }],
+        { max: 200, message: `${this.$t('common:ruleMessage:maxLength')} 200` }],
         ShowQuestion: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
         IsRequired: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
         ParentId: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
@@ -776,7 +548,7 @@ export default {
           if (this.data.hasOwnProperty(k)) {
             if (k === 'ClassifyAlgorithms' && this.data[k] !== undefined && this.data[k] !== '') {
               this.ClassifyAlgorithmsList = JSON.parse(this.data[k])
-            } else if(k === 'FileType'){
+            } else if (k === 'FileType') {
               this.form[k] = this.data[k].split(',')
             } else {
               this.form[k] = this.data[k]
@@ -792,10 +564,10 @@ export default {
             if (this.parentOptions[index].QuestionGenre === 3) {
               // this.parentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
               let dicCode = this.parentOptions[index].DictionaryCode
-              let res = await getCriterionDictionary({ReadingCriterionId: this.criterionId, DictionaryCode: dicCode})
+              let res = await getCriterionDictionary({ ReadingCriterionId: this.criterionId, DictionaryCode: dicCode })
-              
+
-              this.parentTriggerValOptions = res.Result[dicCode].map(i=>{
+              this.parentTriggerValOptions = res.Result[dicCode].map(i => {
-                return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+                return { id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code }
               })
             } else {
               const options = []
@@ -814,9 +586,9 @@ export default {
             if (this.parentOptions[i].QuestionGenre === 3) {
               // this.reParentTriggerValOptions = this.$d[this.parentOptions[i].DictionaryCode]
               let dicCode = this.parentOptions[i].DictionaryCode
-              let res = await getCriterionDictionary({ReadingCriterionId: this.criterionId, DictionaryCode: dicCode})
+              let res = await getCriterionDictionary({ ReadingCriterionId: this.criterionId, DictionaryCode: dicCode })
-              this.reParentTriggerValOptions = res.Result[dicCode].map(i=>{
+              this.reParentTriggerValOptions = res.Result[dicCode].map(i => {
-                return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+                return { id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code }
               })
             } else {
               const options = []
@@ -903,12 +675,12 @@ export default {
         if (index !== -1) {
           if (this.parentOptions[index].QuestionGenre === 3) {
             // this.parentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
-             let dicCode = this.parentOptions[index].DictionaryCode
+            let dicCode = this.parentOptions[index].DictionaryCode
-              let res = await getCriterionDictionary({ReadingCriterionId: this.criterionId, DictionaryCode: dicCode})
+            let res = await getCriterionDictionary({ ReadingCriterionId: this.criterionId, DictionaryCode: dicCode })
-              
+
-              this.parentTriggerValOptions = res.Result[dicCode].map(i=>{
+            this.parentTriggerValOptions = res.Result[dicCode].map(i => {
-                return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+              return { id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code }
-              })
+            })
           } else {
             const options = []
             this.parentOptions[index].TypeValue.split('|').forEach((item, index) => {
@@ -929,10 +701,10 @@ export default {
           if (this.parentOptions[index].QuestionGenre === 3) {
             // this.reParentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
             let dicCode = this.parentOptions[index].DictionaryCode
-            let res = await getCriterionDictionary({ReadingCriterionId: this.criterionId, DictionaryCode: dicCode})
+            let res = await getCriterionDictionary({ ReadingCriterionId: this.criterionId, DictionaryCode: dicCode })
-            
+
-            this.reParentTriggerValOptions = res.Result[dicCode].map(i=>{
+            this.reParentTriggerValOptions = res.Result[dicCode].map(i => {
-              return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+              return { id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code }
             })
           } else {
             const options = []
@@ -993,6 +765,7 @@ export default {
       // form.ExportIdentification = 0
       form.ExportResult = []
       form.DefaultValue = null
+      form.ShowChartTypeEnum = 0
     },
     close() {
       this.$emit('close')
@@ -1001,5 +774,4 @@ export default {
   }
 }
 </script>
-<style lang="scss" scoped>
+<style lang="scss" scoped></style>
-</style>

src/views/dictionary/template/email/components/EmailForm.vue

@@ -1,12 +1,5 @@
 <template>
-  <el-form
+  <el-form ref="emailForm" v-loading="loading" :model="form" label-width="180px" size="small" :rules="rules">
-    ref="emailForm"
-    v-loading="loading"
-    :model="form"
-    label-width="180px"
-    size="small"
-    :rules="rules"
-  >
     <el-row>
       <el-col :span="24">
         <!-- Code -->
@@ -29,12 +22,7 @@
       <el-col :span="12">
         <!-- 邮件延时发送s数 -->
         <el-form-item :label="$t('dictionary:email:label:emailDelaySeconds')" prop="EmailDelaySeconds">
-          <el-input
+          <el-input v-model.number="form.EmailDelaySeconds" style="width: 300px" type="number" clearable>
-            v-model.number="form.EmailDelaySeconds"
-            style="width: 300px"
-            type="number"
-            clearable
-          >
           </el-input>
         </el-form-item>
       </el-col>
@@ -42,12 +30,8 @@
         <!-- 业务层级 -->
         <el-form-item :label="$t('dictionary:email:label:businessLevel')" prop="BusinessLevelEnum">
           <el-select v-model="form.BusinessLevelEnum" clearable class="mr">
-            <el-option
+            <el-option v-for="item of $d.BusinessLevel" :key="`BusinessLevel${item.label}`" :label="item.label"
-              v-for="item of $d.BusinessLevel"
+              :value="item.value" />
-              :key="`BusinessLevel${item.label}`"
-              :label="item.label"
-              :value="item.value"
-            />
           </el-select>
         </el-form-item>
       </el-col>
@@ -55,12 +39,8 @@
         <!-- 业务模块 -->
         <el-form-item :label="$t('dictionary:email:label:businessModule')" prop="BusinessModuleEnum">
           <el-select v-model="form.BusinessModuleEnum" clearable class="mr">
-            <el-option
+            <el-option v-for="item of $d.BusinessModule" :key="`BusinessModule${item.label}`" :label="item.label"
-              v-for="item of $d.BusinessModule"
+              :value="item.value" />
-              :key="`BusinessModule${item.label}`"
-              :label="item.label"
-              :value="item.value"
-            />
           </el-select>
         </el-form-item>
       </el-col>
@@ -68,80 +48,46 @@
         <!-- 业务场景 -->
         <el-form-item :label="$t('trials:emailManageCfg:table:BusinessScenarioEnum')" prop="BusinessScenarioEnum">
           <el-select v-model="form.BusinessScenarioEnum" clearable class="mr">
-            <el-option
+            <el-option v-for="item of $d.Email_BusinessScenario" :key="`BusinessScenarioEnum${item.label}`"
-              v-for="item of $d.Email_BusinessScenario"
+              :label="item.label" :value="item.value" />
-              :key="`BusinessScenarioEnum${item.label}`"
-              :label="item.label"
-              :value="item.value"
-            />
           </el-select>
         </el-form-item>
       </el-col>
       <el-col :span="12">
         <!-- 收件人 -->
         <el-form-item :label="$t('trials:emailManageCfg:title:toUserTypeList')" prop="ToUserTypeList">
-          <el-select
+          <el-select v-model="form.ToUserTypeList" clearable multiple class="mr">
-            v-model="form.ToUserTypeList"
+            <el-option v-for="item of $d.UserType" :key="`ToUserTypeList${item.label}`" :label="item.label"
-            clearable
+              :value="item.value" />
-            multiple
-            class="mr"
-          >
-            <el-option
-              v-for="item of $d.UserType"
-              :key="`ToUserTypeList${item.label}`"
-              :label="item.label"
-              :value="item.value"
-            />
           </el-select>
         </el-form-item>
       </el-col>
       <el-col :span="12">
         <!-- 抄送人 -->
         <el-form-item :label="$t('trials:emailManageCfg:title:copyUserTypeList')" prop="CopyUserTypeList">
-          <el-select
+          <el-select v-model="form.CopyUserTypeList" clearable multiple class="mr">
-            v-model="form.CopyUserTypeList"
+            <el-option v-for="item of $d.UserType" :key="`CopyUserTypeList${item.label}`" :label="item.label"
-            clearable
+              :value="item.value" />
-            multiple
-            class="mr"
-          >
-            <el-option
-              v-for="item of $d.UserType"
-              :key="`CopyUserTypeList${item.label}`"
-              :label="item.label"
-              :value="item.value"
-            />
           </el-select>
         </el-form-item>
       </el-col>
       <el-col :span="12">
         <!-- 加急状态 -->
         <el-form-item :label="$t('dictionary:email:label:IsUrgent')" prop="EmailUrgentEnum">
-          <el-select
+          <el-select v-model="form.EmailUrgentEnum" @change="
-            v-model="form.EmailUrgentEnum"
+            (v) => {
-            @change="
+              v === 1 ? (form.EmailCron = null) : null
-              (v) => {
+            }
-                v === 1 ? (form.EmailCron = null) : null
+          " clearable class="mr">
-              }
+            <el-option v-for="item of $d.EmailUrgent" :key="`EmailUrgent${item.label}`" :label="item.label"
-            "
+              :value="item.value" />
-            clearable
-            class="mr"
-          >
-            <el-option
-              v-for="item of $d.EmailUrgent"
-              :key="`EmailUrgent${item.label}`"
-              :label="item.label"
-              :value="item.value"
-            />
           </el-select>
         </el-form-item>
       </el-col>
       <el-col :span="12">
         <!-- 发送周期和时间 -->
-        <el-form-item
+        <el-form-item :label="$t('trials:emailManageCfg:table:EmailCron')" v-if="form.EmailUrgentEnum !== 1"
-          :label="$t('trials:emailManageCfg:table:EmailCron')"
+          prop="EmailCron">
-          v-if="form.EmailUrgentEnum !== 1"
-          prop="EmailCron"
-        >
           <el-input style="width: 300px" readonly v-model="form.EmailCron" />
           <!-- 生成 cron -->
           <el-button type="primary" @click="showDialog"> {{ $t('dictionary:email:button:cron') }} </el-button>
@@ -151,12 +97,8 @@
         <!-- 是否需要回执 -->
         <el-form-item :label="$t('trials:emailManageCfg:title:isReturnRequired')" prop="IsReturnRequired">
           <el-radio-group v-model="form.IsReturnRequired">
-            <el-radio
+            <el-radio v-for="item of $d.YesOrNo" :label="item.value" :key="`IsReturnRequired${item.value}`">{{
-              v-for="item of $d.YesOrNo"
+              item.label }}</el-radio>
-              :label="item.value"
-              :key="`IsReturnRequired${item.value}`"
-              >{{ item.label }}</el-radio
-            >
           </el-radio-group>
         </el-form-item>
       </el-col>
@@ -164,48 +106,30 @@
         <!-- 是否自动发送 -->
         <el-form-item :label="$t('trials:emailManageCfg:table:IsAutoSend')" prop="IsAutoSend">
           <el-radio-group v-model="form.IsAutoSend">
-            <el-radio
+            <el-radio v-for="item of $d.YesOrNo" :label="item.value" :key="`IsAutoSend${item.value}`">{{ item.label
-              v-for="item of $d.YesOrNo"
+            }}</el-radio>
-              :label="item.value"
-              :key="`IsAutoSend${item.value}`"
-              >{{ item.label }}</el-radio
-            >
           </el-radio-group>
         </el-form-item>
       </el-col>
       <el-col :span="12" v-if="systemLevel">
         <!-- 是否区分标准 -->
         <el-form-item :label="$t('dictionary:email:button:isDistinguishCriteria')" prop="IsDistinguishCriteria">
-          <el-radio-group
+          <el-radio-group v-model="form.IsDistinguishCriteria" @change="
-            v-model="form.IsDistinguishCriteria"
+            () => {
-            @change="
+              form.CriterionTypeEnum = null
-              () => {
+            }
-                form.CriterionTypeEnum = null
+          ">
-              }
+            <el-radio v-for="item of $d.YesOrNo" :label="item.value" :key="`IsDistinguishCriteria${item.value}`">{{
-            "
+              item.label }}</el-radio>
-          >
-            <el-radio
-              v-for="item of $d.YesOrNo"
-              :label="item.value"
-              :key="`IsDistinguishCriteria${item.value}`"
-              >{{ item.label }}</el-radio
-            >
           </el-radio-group>
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item
+        <el-form-item :label="$t('trials:auditRecord:table:criterion')" v-if="form.IsDistinguishCriteria"
-          :label="$t('trials:auditRecord:table:criterion')"
+          prop="CriterionTypeList">
-          v-if="form.IsDistinguishCriteria"
+          <el-select v-model="form.CriterionTypeList" clearable class="mr" multiple>
-          prop="CriterionTypeEnum"
+            <el-option v-for="item of $d.CriterionType" :key="`CriterionType${item.label}`" :label="item.label"
-        >
+              :value="item.value" />
-          <el-select v-model="form.CriterionTypeEnum" clearable class="mr">
-            <el-option
-              v-for="item of $d.CriterionType"
-              :key="`CriterionType${item.label}`"
-              :label="item.label"
-              :value="item.value"
-            />
           </el-select>
         </el-form-item>
       </el-col>
@@ -213,106 +137,65 @@
         <!-- 是否启用 -->
         <el-form-item :label="$t('trials:emailManageCfg:table:IsEnable')" prop="IsEnable">
           <el-radio-group v-model="form.IsEnable">
-            <el-radio
+            <el-radio v-for="item of $d.YesOrNo" :label="item.value" :key="`IsEnable${item.value}`">{{ item.label
-              v-for="item of $d.YesOrNo"
+            }}</el-radio>
-              :label="item.value"
-              :key="`IsEnable${item.value}`"
-              >{{ item.label }}</el-radio
-            >
           </el-radio-group>
         </el-form-item>
       </el-col>
       <el-col :span="12">
         <!-- 附件（CN） -->
         <el-form-item :label="$t('trials:emailManageCfg:table:fileListCN')" prop="IsEnable">
-          <el-upload
+          <el-upload class="upload-demo" action :before-upload="beforeUploadCN" :http-request="handleUploadFileCN"
-            class="upload-demo"
+            :on-preview="handlePreviewCN" :on-remove="handleRemoveFileCN" :show-file-list="true" :limit="1"
-            action
+            :file-list="fileListCN">
-            :before-upload="beforeUploadCN"
+            <el-button size="small" type="primary" :disabled="fileListCN.length > 0">{{ $t('common:button:upload')
-            :http-request="handleUploadFileCN"
+            }}</el-button>
-            :on-preview="handlePreviewCN"
-            :on-remove="handleRemoveFileCN"
-            :show-file-list="true"
-            :limit="1"
-            :file-list="fileListCN"
-          >
-            <el-button
-              size="small"
-              type="primary"
-              :disabled="fileListCN.length > 0"
-              >{{ $t('common:button:upload') }}</el-button
-            >
           </el-upload>
         </el-form-item>
       </el-col>
       <el-col :span="12">
         <!-- 附件（EN） -->
         <el-form-item :label="$t('trials:emailManageCfg:table:fileListEN')" prop="IsEnable">
-          <el-upload
+          <el-upload class="upload-demo" action :before-upload="beforeUploadEN" :http-request="handleUploadFileEN"
-            class="upload-demo"
+            :on-preview="handlePreviewEN" :on-remove="handleRemoveFileEN" :show-file-list="true" :limit="1"
-            action
+            :file-list="fileListEN">
-            :before-upload="beforeUploadEN"
+            <el-button size="small" type="primary" :disabled="fileListEN.length > 0">{{ $t('common:button:upload')
-            :http-request="handleUploadFileEN"
+            }}</el-button>
-            :on-preview="handlePreviewEN"
-            :on-remove="handleRemoveFileEN"
-            :show-file-list="true"
-            :limit="1"
-            :file-list="fileListEN"
-          >
-            <el-button
-              size="small"
-              type="primary"
-              :disabled="fileListEN.length > 0"
-              >{{ $t('common:button:upload') }}</el-button
-            >
           </el-upload>
         </el-form-item>
       </el-col>
     </el-row>
     <!-- 邮件内容模版（CN） -->
-    <el-form-item
+    <el-form-item :label="$t('dictionary:email:label:emailHtmlContentCN')" prop="EmailHtmlContentCN"
-      :label="$t('dictionary:email:label:emailHtmlContentCN')"
+      style="position: relative">
-      prop="EmailHtmlContentCN"
+      <div class="html_temp">
-      style="position: relative"
+        <prism-editor class="my-editor" v-model="form.EmailHtmlContentCN" :highlight="highlighter" :line-numbers="true"
-    >
+          style="width: 50%;max-height: 500px;"></prism-editor>
-      <el-input
+        <div v-html="form.EmailHtmlContentCN" style="width: 50%;"></div>
-        v-model="form.EmailHtmlContentCN"
+      </div>
-        type="textarea"
+      <!-- <el-input v-model="form.EmailHtmlContentCN" type="textarea" :autosize="{ minRows: 8, maxRows: 8 }" />
-        :autosize="{ minRows: 8, maxRows: 8 }"
+      <el-button :disabled="!form.EmailHtmlContentCN && form.EmailHtmlContent" type="text"
-      />
-      <el-button
-        :disabled="!form.EmailHtmlContentCN && form.EmailHtmlContent"
-        type="text"
         @click="PreviewHTML(form.EmailHtmlContentCN, form.EmailHtmlContent)"
-        style="position: absolute; left: -50px; top: 30px"
+        style="position: absolute; left: -50px; top: 30px">
-      >
         {{ $t('common:button:preview') }}
-      </el-button>
+      </el-button> -->
     </el-form-item>
     <!-- 邮件内容模版（EN） -->
-    <el-form-item
+    <el-form-item :label="$t('dictionary:email:label:emailHtmlContent')" prop="EmailHtmlContent"
-      :label="$t('dictionary:email:label:emailHtmlContent')"
+      style="position: relative">
-      prop="EmailHtmlContent"
+      <div class="html_temp">
-      style="position: relative"
+        <prism-editor class="my-editor" v-model="form.EmailHtmlContent" :highlight="highlighter" :line-numbers="true"
-    >
+          style="width: 50%;max-height: 500px;"></prism-editor>
-      <el-input
+        <div v-html="form.EmailHtmlContent" style="width: 50%;"></div>
-        v-model="form.EmailHtmlContent"
+      </div>
-        type="textarea"
+      <!-- <el-input v-model="form.EmailHtmlContent" type="textarea" :autosize="{ minRows: 8, maxRows: 8 }" />
-        :autosize="{ minRows: 8, maxRows: 8 }"
+      <el-button :disabled="!form.EmailHtmlContentCN && form.EmailHtmlContent" type="text"
-      />
-      <el-button
-        :disabled="!form.EmailHtmlContentCN && form.EmailHtmlContent"
-        type="text"
         @click="PreviewHTML(form.EmailHtmlContentCN, form.EmailHtmlContent)"
-        style="position: absolute; left: -50px; top: 30px"
+        style="position: absolute; left: -50px; top: 30px">
-      >
         {{ $t('common:button:preview') }}
-      </el-button>
+      </el-button> -->
     </el-form-item>
-    <div
+    <div class="base-dialog-footer" style="text-align: right; margin-top: 10px; padding-bottom: 10px">
-      class="base-dialog-footer"
-      style="text-align: right; margin-top: 10px; padding-bottom: 10px"
-    >
       <el-form-item style="text-align: right">
         <el-button size="small" type="primary" @click="handleSave">
           {{ $t('common:button:save') }}
@@ -321,12 +204,7 @@
     </div>
     <!-- 生成 cron -->
     <el-dialog append-to-body :title="$t('dictionary:email:button:cron')" :visible.sync="showCron">
-      <vcrontab
+      <vcrontab :hideComponent="['year']" @hide="showCron = false" @fill="crontabFill" :expression="expression">
-        :hideComponent="['year']"
-        @hide="showCron = false"
-        @fill="crontabFill"
-        :expression="expression"
-      >
       </vcrontab>
     </el-dialog>
   </el-form>
@@ -334,6 +212,14 @@
 <script>
 import { Upload, addOrUpdateEmailNoticeConfigList } from '@/api/dictionary'
 import vcrontab from 'vcrontab'
+
+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 {
   props: {
     data: {
@@ -355,7 +241,7 @@ export default {
       },
     },
   },
-  components: { vcrontab },
+  components: { vcrontab, PrismEditor },
   data() {
     return {
       expression: '',
@@ -385,6 +271,7 @@ export default {
         IsAutoSend: true,
         CriterionTypeEnum: null,
         EmailDelaySeconds: null,
+        CriterionTypeList: []
       },
       rules: {
         Code: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] }],
@@ -415,8 +302,8 @@ export default {
         EmailHtmlContent: [
           { required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] },
         ],
-        CriterionTypeEnum: [
+        CriterionTypeList: [
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] },
+          { required: true, type: 'array', message: this.$t('common:ruleMessage:select'), trigger: ['blur'] },
         ],
       },
       scenarioOption: [],
@@ -440,6 +327,9 @@ export default {
     }
   },
   methods: {
+    highlighter(code) {
+      return highlight(code, languages.js);
+    },
     showDialog() {
       this.expression = this.form.EmailCron //传入的 cron 表达式，可以反解析到 UI 上
       this.showCron = true
@@ -563,3 +453,13 @@ export default {
   },
 }
 </script>
+<style lang="scss" scoped>
+.html_temp {
+  display: flex;
+
+  .my-editor {
+    border: 1px solid #333;
+  }
+
+}
+</style>

src/views/dictionary/template/email/components/EmailList.vue

@@ -67,20 +67,26 @@
           <el-button type="primary" @click="handleAdd">
             {{ $t('common:button:new') }}
           </el-button>
+          <el-button type="primary" @click="openDrawer" :disabled="multipleSelection.length <= 0">
+            {{ $t('trials:emailManageCfg:button:batchAudit') }}
+          </el-button>
         </el-form-item>
       </el-form>
     </div>
     <!-- 受试者列表 -->
     <el-table v-loading="loading" v-adaptive="{ bottomOffset: 45 }" :data="list" stripe height="100" style="width: 100%"
-      @sort-change="handleSortByColumn">
+      @sort-change="handleSortByColumn" @selection-change="handleSelectionChange">
-      <el-table-column type="index" width="40" />
+      <!-- <el-table-column type="index" width="40" /> -->
+      <el-table-column type="selection" width="55">
+      </el-table-column>
       <!-- Code -->
       <el-table-column prop="Code" :label="$t('trials:emailManageCfg:title:code')" sortable="custom"
         show-overflow-tooltip min-width="100" />
       <el-table-column v-if="isDistinguishCriteria" prop="TrialReadingCriterionId"
         :label="$t('trials:reviewTrack:table:criterionName')" show-overflow-tooltip sortable="custom" min-width="120">
         <template slot-scope="scope">
-          {{ $fd('CriterionType', scope.row.CriterionTypeEnum) }}
+          {{scope.row.CriterionTypeList ? scope.row.CriterionTypeList.map(item => $fd('CriterionType', item)).join(', ')
+          : ''}}
         </template>
       </el-table-column>
       <!-- 邮件主题（中文） -->
@@ -249,12 +255,76 @@
         </div>
       </div>
     </el-dialog>
+    <el-drawer :title="$t('trials:emailManageCfg:title:audit')" :visible.sync="drawer" direction="rtl" size="80%">
+      <!-- <div style="width: 800px">
+        <el-form label-width="100px" @submit.native.prevent size="small" :inline="true" class="demo-form-inline">
+          <el-form-item :label="$t('il8n:search:keyword')">
+            <el-input v-model="key" @input="keyChange" />
+          </el-form-item>
+          <el-form-item :label="$t('il8n:search:state')">
+            <el-select v-model="State" clearable filterable @change="handleStateChange">
+              <el-option v-for="item of $d.InternationalizationKeyState"
+                :key="'InternationalizationKeyState' + item.value" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-form>
+      </div> -->
+      <el-table :data="tableData" v-adaptive="{ bottomOffset: 50 }" height="100" style="width: 100%"
+        @sort-change="handleSortByColumnDrawer">
+        <!-- Code -->
+        <el-table-column prop="Code" :label="$t('trials:emailManageCfg:title:code')" sortable="custom"
+          show-overflow-tooltip min-width="100" />
+        <el-table-column v-if="isDistinguishCriteria" prop="TrialReadingCriterionId"
+          :label="$t('trials:reviewTrack:table:criterionName')" show-overflow-tooltip sortable="custom" min-width="120">
+          <template slot-scope="scope">
+            {{ $fd('CriterionType', scope.row.CriterionTypeEnum) }}
+          </template>
+        </el-table-column>
+        <!-- 邮件主题（中文） -->
+        <el-table-column prop="EmailTopicCN" :label="$t('trials:emailManageCfg:table:EmailTopicCN')" sortable="custom"
+          show-overflow-tooltip min-width="160">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.EmailTopicCN" @input="
+              (e) => {
+                $set(scope.row, 'EmailTopicCN', e)
+              }
+            " size="mini"></el-input>
+          </template>
+        </el-table-column>
+        <!-- 邮件主题（英文） -->
+        <el-table-column prop="EmailTopic" :label="$t('trials:emailManageCfg:table:EmailTopic')" sortable="custom"
+          show-overflow-tooltip min-width="160">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.EmailTopic" @input="
+              (e) => {
+                $set(scope.row, 'EmailTopic', e)
+              }
+            " size="mini"></el-input>
+          </template>
+        </el-table-column>
+        <!-- 业务层级 -->
+        <el-table-column prop="BusinessLevelEnum" :label="$t('dictionary:email:label:businessLevel')" sortable="custom"
+          show-overflow-tooltip min-width="150">
+          <template slot-scope="scope">
+            {{ $fd('BusinessLevel', scope.row.BusinessLevelEnum) }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <div style="text-align: right; padding-top: 10px; padding-right: 10px">
+        <el-button size="mini" @click="drawer = false">{{ $t('common:button:cancel') }}
+        </el-button>
+        <el-button size="mini" type="primary" @click="handleSave">{{
+          $t('common:button:save')
+        }}</el-button>
+      </div>
+    </el-drawer>
   </box-content>
 </template>
 <script>
 import {
   getEmailNoticeConfigList,
   deleteEmailNoticeConfig,
+  batchUpdateEmail
 } from '@/api/dictionary'
 import { GetEmailNoticeConfigList_Export } from '@/api/export'
 import BoxContent from '@/components/BoxContent'
@@ -308,6 +378,9 @@ export default {
       previewVisible: false,
       previewHTML: null,
       previewHTMLEN: null,
+      multipleSelection: [],
+      drawer: false,
+      tableData: []
     }
   },
   computed: {
@@ -325,6 +398,50 @@ export default {
     this.getList()
   },
   methods: {
+    async handleSave() {
+      try {
+        let arr = []
+        this.tableData.forEach(item => {
+          let obj = {
+            EmailTopic: item.EmailTopic,
+            EmailTopicCN: item.EmailTopicCN,
+            Id: item.Id
+          }
+          arr.push(obj)
+        })
+        this.drawer = false
+        let res = await batchUpdateEmail(arr)
+        if (res.IsSuccess) {
+          this.$message.success(this.$t('trials:emailManageCfg:message:auditSuccess'))
+          this.getList()
+        }
+      } catch (err) {
+        console.log(err)
+      }
+    },
+    // 排序
+    handleSortByColumnDrawer(column) {
+      if (column.order === 'ascending') {
+        this.tableData.sort((a, b) =>
+          a[column.prop].localeCompare(b[column.prop])
+        )
+      } else {
+        this.tableData.sort((a, b) =>
+          b[column.prop].localeCompare(a[column.prop])
+        )
+      }
+    },
+    openDrawer() {
+      this.tableData = []
+      this.multipleSelection.forEach(item => {
+        let obj = Object.assign({}, item)
+        this.tableData.push(obj)
+      })
+      this.drawer = true
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
     // 获取受试者列表
     getList() {
       this.loading = true

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>
-

src/views/email-recompose/index.vue

@@ -164,6 +164,14 @@ export default {
             },
           },
         ],
+        Email: [
+          {
+            // type: 'email',
+            pattern: new RegExp(this.$reg().EmailRegexStr),
+            message: this.$t('rules:email'),
+            trigger: 'blur,change',
+          },
+        ]
       },
       userId: null,
       loading: false,

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>
       <!-- 校验 -->
@@ -125,6 +131,9 @@ export default {
       } else {
         var reg =
           /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
+        if (this.$reg().EmailRegexStr) {
+          reg = new RegExp(this.$reg().EmailRegexStr)
+        }
         if (this.form.EmailOrPhone && reg.test(this.form.EmailOrPhone)) {
           this.sendDisabled = false
           callback()
@@ -378,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;
 }

src/views/login/index.vue

@@ -7,20 +7,13 @@
       <div class="login-l">
         <div class="login-logo">
           <img v-if="language === 'zh'" src="@/assets/zzlogo2.png" alt="" />
-          <img
+          <img v-else-if="NODE_ENV === 'usa'" src="@/assets/zzlogo-usa.png" alt="" class="usa-logo" />
-            v-else-if="NODE_ENV === 'usa'"
-            src="@/assets/zzlogo-usa.png"
-            alt=""
-            class="usa-logo"
-          />
           <img v-else src="@/assets/zzlogo4.png" alt="" />
         </div>
-        <div
+        <div :class="{
-          :class="{
+          'login-image': true,
-            'login-image': true,
+          'login-image-usa': true,
-            'login-image-usa': true,
+        }">
-          }"
-        >
           <svg-icon icon-class="login-bg" style="width: 90%; height: 90%" />
           <!-- <img src="@/assets/login-bg.png" v-else /> -->
         </div>
@@ -29,77 +22,43 @@
         <div class="title-container">
           <!-- IRC Management System -->
           <div v-if="NODE_ENV === 'usa'">
-            <svg-icon
+            <svg-icon icon-class="login-logo" style="width: 300px; height: 94px" />
-              icon-class="login-logo"
-              style="width: 300px; height: 94px"
-            />
           </div>
           <div class="title" v-else>{{ $t('login:title:system') }}</div>
         </div>
-        <el-form
+        <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on"
-          ref="loginForm"
+          label-position="left">
-          :model="loginForm"
+          <el-form-item prop="username" :rules="[
-          :rules="loginRules"
+            {
-          class="login-form"
+              required: true,
-          auto-complete="on"
+              message: this.$t('login:formRule:userName'),
-          label-position="left"
+              trigger: 'blur',
-        >
+            },
-          <el-form-item
+          ]">
-            prop="username"
-            :rules="[
-              {
-                required: true,
-                message: this.$t('login:formRule:userName'),
-                trigger: 'blur',
-              },
-            ]"
-          >
             <span class="svg-container">
               <svg-icon icon-class="user" />
             </span>
             <!-- User Name -->
-            <el-input
+            <el-input ref="username" v-model="loginForm.username" size="small" :placeholder="$t('login:form:userName')"
-              ref="username"
+              name="username" type="text" tabindex="1" />
-              v-model="loginForm.username"
-              size="small"
-              :placeholder="$t('login:form:userName')"
-              name="username"
-              type="text"
-              tabindex="1"
-            />
           </el-form-item>
 
-          <el-form-item
+          <el-form-item prop="password" :rules="[
-            prop="password"
+            {
-            :rules="[
+              required: true,
-              {
+              message: this.$t('login:formRule:password'),
-                required: true,
+              trigger: 'blur',
-                message: this.$t('login:formRule:password'),
+            },
-                trigger: 'blur',
+          ]">
-              },
-            ]"
-          >
             <span class="svg-container">
               <svg-icon icon-class="password" />
             </span>
             <!-- password -->
-            <el-input
+            <el-input :key="passwordType" ref="password" v-model="loginForm.password" size="small" :type="passwordType"
-              :key="passwordType"
+              :placeholder="$t('login:form:password')" name="password" auto-complete="new-password"
-              ref="password"
+              autocomplete="new-password" tabindex="2" @keyup.enter.native="handleLogin" />
-              v-model="loginForm.password"
-              size="small"
-              :type="passwordType"
-              :placeholder="$t('login:form:password')"
-              name="password"
-              auto-complete="new-password"
-              autocomplete="new-password"
-              tabindex="2"
-              @keyup.enter.native="handleLogin"
-            />
             <span class="show-pwd" @click="showPwd">
-              <svg-icon
+              <svg-icon :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'" />
-                :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'"
-              />
             </span>
             <!-- <el-input
               :key="passwordType"
@@ -118,33 +77,29 @@
             </span> -->
           </el-form-item>
           <!-- Login -->
-          <el-button
+          <el-button :loading="loading" type="primary" :disabled="!checked" style="
-            :loading="loading"
-            type="primary"
-            style="
               width: 100%;
               margin-bottom: 10px;
               background-color: rgb(0, 147, 221);
-            "
+            " size="medium" @click.native.prevent="handleLogin">
-            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
+            <TopLang v-if="
-              v-if="
+              VUE_APP_OSS_CONFIG_REGION !== 'oss-us-west-1' &&
-                VUE_APP_OSS_CONFIG_REGION !== 'oss-us-west-1' &&
+              NODE_ENV !== 'usa'
-                NODE_ENV !== 'usa'
+            " />
-              "
-            />
             <!-- Forget password? -->
-            <el-button
+            <el-button type="text" size="medium" @click.native.prevent="handleResetPwd" style="color: rgb(0, 147, 221)">
-              type="text"
-              size="medium"
-              @click.native.prevent="handleResetPwd"
-              style="color: rgb(0, 147, 221)"
-            >
               {{ $t('login:button:forgetPassword') }}
             </el-button>
           </div>
@@ -152,19 +107,14 @@
       </div>
     </div>
     <div v-if="language === 'zh'" class="login-footer">
-      <span
+      <span>Copyright © {{ new Date().getFullYear() }} 上海展影医疗科技有限公司
-        >Copyright © {{ new Date().getFullYear() }} 上海展影医疗科技有限公司
+        版权所有</span>
-        版权所有</span
-      >
       <span> | </span>
       <a target="_blank" href="https://beian.miit.gov.cn/">
         <span> 沪ICP备2021037850-2 </span>
       </a>
       <span> | </span>
-      <a
+      <a target="_blank" href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=31011002005859">
-        target="_blank"
-        href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=31011002005859"
-      >
         <img src="@/assets/filing.png" />
         <span>沪公网安备 31011002005859号</span>
       </a>
@@ -180,43 +130,23 @@
         <span style="color: #428bca">About</span>
       </a>
     </div>
-    <Vcode
+    <Vcode :show="isShow" :fail-text="$t('login:button:failText')" :success-text="$t('login:button:successText')"
-      :show="isShow"
+      :slider-text="$t('login:button:sliderText')" :imgs="[Img1]" @success="onSuccess" />
-      :fail-text="$t('login:button:failText')"
+    <el-dialog v-if="aboutVisible" :visible.sync="aboutVisible" width="680px" style="margin-top: 0"
-      :success-text="$t('login:button:successText')"
+      :close-on-click-modal="false" size="small">
-      :slider-text="$t('login:button:sliderText')"
+      <div style="
-      :imgs="[Img1]"
-      @success="onSuccess"
-    />
-    <el-dialog
-      v-if="aboutVisible"
-      :visible.sync="aboutVisible"
-      width="680px"
-      style="margin-top: 0"
-      :close-on-click-modal="false"
-      size="small"
-    >
-      <div
-        style="
           margin: 0 auto;
           width: 600px;
           line-height: 28px;
           text-align: center;
-        "
+        ">
-      >
+        <h1 style="text-align: center; margin-bottom: 30px" v-if="NODE_ENV === 'usa'">
-        <h1
-          style="text-align: center; margin-bottom: 30px"
-          v-if="NODE_ENV === 'usa'"
-        >
           About
         </h1>
         <h1 style="text-align: center; margin-bottom: 30px" v-else>关于</h1>
         <p style="margin-bottom: 0px" v-if="NODE_ENV === 'usa'">
           <!-- {{ $t('login:title:system_title_about') }} -->
-          <svg-icon
+          <svg-icon icon-class="login-logo" style="width: 250px; height: 71px" />
-            icon-class="login-logo"
-            style="width: 250px; height: 71px"
-          />
         </p>
         <p style="margin-bottom: 0px" v-else>{{ $t('login:title:system') }}</p>
         <p style="margin-bottom: 20px; margin-top: 0">
@@ -247,13 +177,8 @@
       </div>
     </el-dialog>
     <browserTip ref="browserTip" />
-    <toggleRole
+    <toggleRole v-if="toggleRoleVisible" :visible.sync="toggleRoleVisible" :loading="toggleRoleLoading"
-      v-if="toggleRoleVisible"
+      @save="loginByRole" @cancel="cancel" />
-      :visible.sync="toggleRoleVisible"
-      :loading="toggleRoleLoading"
-      @save="loginByRole"
-      @cancel="cancel"
-    />
   </div>
 </template>
 
@@ -265,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 },
@@ -312,6 +240,8 @@ export default {
       Img1,
       toggleRoleVisible: false,
       toggleRoleLoading: false,
+      Agreement: [],
+      checked: true
     }
   },
   computed: {
@@ -339,7 +269,13 @@ export default {
     this.location = this.$route.query.location
     zzSessionStorage.setItem('loginType', this.loginType)
     localStorage.setItem('location', this.location)
-    if (process.env.VUE_APP_OSS_CONFIG_REGION === 'oss-us-west-1') {
+    // zh-CN navigator.language
+    if (navigator.language !== 'zh-CN' && navigator.language !== 'zh-TW') {
+      this.$i18n.locale = 'en'
+      this.setLanguage('en')
+      this.$updateDictionary()
+    }
+    else if (process.env.VUE_APP_OSS_CONFIG_REGION === 'oss-us-west-1') {
       this.$i18n.locale = 'en'
       this.setLanguage('en')
       this.$updateDictionary()
@@ -355,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
     },
@@ -516,7 +473,7 @@ export default {
         Array.isArray(this.$store.state.user.roles) &&
         this.$store.state.user.roles.filter((item) => item.IsUserRoleDisabled)
           .length ===
-          this.$store.state.user.roles.length - 1
+        this.$store.state.user.roles.length - 1
       ) {
         let role = this.$store.state.user.roles.find(
           (item) => !item.IsUserRoleDisabled
@@ -640,6 +597,7 @@ $cursor: #fff;
       // }
     }
   }
+
   .login-r {
     .el-form-item {
       border: 1px solid rgba(255, 255, 255, 0.1);
@@ -655,23 +613,28 @@ $cursor: #fff;
 $bg: #2d3a4b;
 $dark_gray: #889aa4;
 $light_gray: #606266;
+
 .login-container {
   position: relative;
   width: 100%;
   height: 100%;
   overflow: auto;
   background: rgb(249, 249, 249);
+
   ::v-deep .el-input__inner::placeholder {
     color: $dark_gray;
   }
+
   .login-header {
     margin: 10px 0px 20px 10px;
     height: 3rem;
     width: 720px;
+
     .login-logo {
       height: 100%;
     }
   }
+
   .login-body {
     position: absolute;
     left: 50%;
@@ -685,32 +648,39 @@ $light_gray: #606266;
     box-sizing: border-box;
     background: rgb(255, 255, 255);
     border-radius: 10px 0px 0px 10px;
+
     .login-l {
       position: relative;
       float: left;
       width: 50%;
       height: 100%;
+
       .login-logo {
         position: absolute;
         top: 35px;
         left: 50px;
+
         img {
           height: 40px;
         }
+
         .usa-logo {
           height: 60px;
         }
       }
+
       .login-image {
         position: absolute;
         top: 10px;
         left: 0px;
         // transform: translateY(-50%);
         height: 100%;
+
         img {
           height: 100%;
         }
       }
+
       .login-image-usa {
         width: 100%;
         display: flex;
@@ -718,6 +688,7 @@ $light_gray: #606266;
         justify-content: flex-end;
       }
     }
+
     .login-r {
       position: relative;
       float: left;
@@ -735,16 +706,19 @@ $light_gray: #606266;
         margin: 0 auto;
         overflow: hidden;
       }
+
       .title-container {
         // margin-bottom: 50px;
         text-align: center;
         margin-top: 20%;
+
         .title {
           font-size: 35px;
           color: $light_gray;
           text-align: center;
           font-weight: bold;
         }
+
         .title-logo-message {
           font-size: 26px;
           color: $light_gray;
@@ -784,6 +758,7 @@ $light_gray: #606266;
       }
     }
   }
+
   .login-footer {
     position: absolute;
     bottom: 50px;
@@ -797,6 +772,7 @@ $light_gray: #606266;
     align-items: center;
     // color: rgb(180, 190, 199);
     color: #909399;
+
     a {
       display: inline-block;
       text-decoration: none;
@@ -805,13 +781,16 @@ $light_gray: #606266;
       display: flex;
       justify-content: center;
     }
+
     span {
       margin: 0 2px;
     }
+
     img {
       height: 20px;
       line-height: 20px;
     }
+
     // p{
     //   display: inline-block;
     //   height:20px;

src/views/none-dicom-show/index.vue

@@ -7,78 +7,47 @@
       <div class="left-content">
         <!-- 检查层级 -->
         <el-collapse v-model="activeNames" @change="handleChange">
-          <el-collapse-item
+          <el-collapse-item v-for="(study, i) in studyList" :key="study.CodeView" :name="study.CodeView"><template
-            v-for="(study, i) in studyList"
+              slot="title">
-            :key="study.CodeView"
-            :name="study.CodeView"
-            ><template slot="title">
               <div class="study-desc">
                 <span>{{ study.CodeView }}</span>
                 <span v-if="OtherInfo.IsShowStudyName" style="margin-left: 5px">
                   {{ study.StudyName }}
                 </span>
                 <span style="margin: 0 5px">{{ study.Modality }}</span>
-                <span>{{ getBodyPart(study.BodyPart) }}</span>
+                <span>{{ getBodyPart(study.BodyPart, study.BodyPartForEditOther) }}</span>
               </div>
             </template>
             <!-- 文件层级 -->
-            <div
+            <div v-if="study.NoneDicomStudyFileList.length === 0" class="empty-text">
-              v-if="study.NoneDicomStudyFileList.length === 0"
-              class="empty-text"
-            >
               <slot name="empty">{{ $t('trials:audit:message:noData') }}</slot>
             </div>
             <div v-else id="imgList" style="height: 100%; overflow: hidden">
               <template v-for="(item, j) in study.NoneDicomStudyFileList">
-                <div
+                <div :id="`img${item.Id}`" :key="item.Id" :class="{
-                  :id="`img${item.Id}`"
+                  'is-boxActive': item.Id === currentFileId,
-                  :key="item.Id"
+                }" class="img-box" @click="selected(item, i, j, true)">
-                  :class="{
-                    'is-boxActive': item.Id === currentFileId,
-                  }"
-                  class="img-box"
-                  @click="selected(item, i, j, true)"
-                >
                   <div class="file-image">
-                    <el-image
+                    <el-image v-if="
-                      v-if="
+                      [
-                        [
+                        'image/jpeg',
-                          'image/jpeg',
+                        'image/jpg',
-                          'image/jpg',
+                        'image/png',
-                          'image/png',
+                        'image/bmp',
-                          'image/bmp',
+                      ].includes(item.FileType)
-                        ].includes(item.FileType)
+                    " style="width: 100%; height: 100%"
-                      "
-                      style="width: 100%; height: 100%"
                       :src="`${OSSclientConfig.basePath}${item.Path}?x-oss-process=image/resize,w_50,h_50/format,png`"
-                      fit="contain"
+                      fit="contain" crossorigin="anonymous" />
-                      crossorigin="anonymous"
+                    <el-image v-else-if="item.FileType === 'application/pdf'" style="width: 100%; height: 100%"
-                    />
+                      :src="pdf" fit="contain" crossorigin="anonymous" />
-                    <el-image
+                    <el-image v-else-if="
-                      v-else-if="item.FileType === 'application/pdf'"
+                      item.FileType === 'application/x-zip-compressed'
-                      style="width: 100%; height: 100%"
+                    " style="width: 100%; height: 100%" :src="zip" fit="contain" crossorigin="anonymous" />
-                      :src="pdf"
-                      fit="contain"
-                      crossorigin="anonymous"
-                    />
-                    <el-image
-                      v-else-if="
-                        item.FileType === 'application/x-zip-compressed'
-                      "
-                      style="width: 100%; height: 100%"
-                      :src="zip"
-                      fit="contain"
-                      crossorigin="anonymous"
-                    />
                   </div>
                   <div v-if="item.FileName.length < 15" class="img-text">
                     {{ `${j + 1}. ${item.FileName}` }}
                   </div>
-                  <el-tooltip
+                  <el-tooltip v-else :content="item.FileName" placement="bottom">
-                    v-else
-                    :content="item.FileName"
-                    placement="bottom"
-                  >
                     <div class="img-text">
                       {{ `${j + 1}. ${item.FileName}` }}
                     </div>
@@ -86,23 +55,15 @@
                   <div v-if="isQcCheck" class="switchBox">
                     <div class="item">
                       <span>{{ $t('trials:audit:table:isReading') }}</span>
-                      <el-switch
+                      <el-switch v-model="item.IsReading" :disabled="item.IsDeleted || isAudit"
-                        v-model="item.IsReading"
+                        @change="changeReadingStatus($event, study, item)" :active-text="$fd('YesOrNo', true)"
-                        :disabled="item.IsDeleted || isAudit"
+                        :inactive-text="$fd('YesOrNo', false)" />
-                        @change="changeReadingStatus($event, study, item)"
-                        :active-text="$fd('YesOrNo', true)"
-                        :inactive-text="$fd('YesOrNo', false)"
-                      />
                     </div>
                     <div class="item">
                       <span>{{ $t('trials:audit:table:isDelete') }}</span>
-                      <el-switch
+                      <el-switch v-model="item.IsDeleted" :disabled="isAudit"
-                        v-model="item.IsDeleted"
+                        @change="changeDeleteStatus($event, study, item)" :active-text="$fd('YesOrNo', true)"
-                        :disabled="isAudit"
+                        :inactive-text="$fd('YesOrNo', false)" />
-                        @change="changeDeleteStatus($event, study, item)"
-                        :active-text="$fd('YesOrNo', true)"
-                        :inactive-text="$fd('YesOrNo', false)"
-                      />
                     </div>
                   </div>
                 </div>
@@ -115,14 +76,8 @@
     <!-- 预览图像 -->
     <el-card class="box-card right">
       <div style="width: 100%; height: 100%" v-if="!showPDF">
-        <Preview
+        <Preview v-if="previewImage.imgList.length > 0" ref="previewImage" style="width: 100%"
-          v-if="previewImage.imgList.length > 0"
+          :preview-image="previewImage" :value="currentStudyFileIndex" @selectedImg="selectedImg" />
-          ref="previewImage"
-          style="width: 100%"
-          :preview-image="previewImage"
-          :value="currentStudyFileIndex"
-          @selectedImg="selectedImg"
-        />
       </div>
       <div style="width: 100%; height: 100%" v-else>
         <PreviewFile :file-path="pdfFile.path" :file-type="pdfFile.type" />
@@ -174,7 +129,7 @@ export default {
       subjectVisitId: '',
       sudyId: '',
       loading: false,
-      bp: [],
+      BodyPart: {},
       OtherInfo: {},
       showPDF: false,
       pdfFile: {
@@ -188,7 +143,7 @@ export default {
     }
   },
   async created() {
-    this.bp = await this.$getBodyPart(this.$route.query.trialId)
+    this.BodyPart.Bodypart = await this.$getBodyPart(this.$route.query.trialId)
     this.isQcCheck = !!this.$route.query.isQcCheck
   },
   async mounted() {
@@ -202,7 +157,7 @@ export default {
     // 默认选择第一个文件
   },
   methods: {
-    handleChange() {},
+    handleChange() { },
     changeReadingStatus(callback, row, file) {
       let statusStr = ''
       if (callback) {
@@ -245,7 +200,7 @@ export default {
               this.loading = false
             })
         })
-        .catch(() => {})
+        .catch(() => { })
     },
     changeDeleteStatus(callback, row, file) {
       let statusStr = ''
@@ -295,8 +250,8 @@ export default {
           // file.IsDeleted = !file.IsDeleted
         })
     },
-    getBodyPart(bodyPart) {
+    getBodyPart(bodyPart, other) {
-      if (!bodyPart) return ''
+      if (!bodyPart && !other) return ''
       var separator = ','
       if (bodyPart.indexOf('|') > -1) {
         separator = '|'
@@ -307,14 +262,12 @@ export default {
       }
       var arr = bodyPart.split(separator)
       var newArr = arr.map((i) => {
-        return this.$fd(
+        return this.$fd('Bodypart', i.trim(), 'Code', this.BodyPart, 'Name')
-          'Bodypart',
-          i.trim(),
-          'Code',
-          { Bodypart: this.bp },
-          'Name'
-        )
       })
+      if (other) {
+        newArr.push(other)
+      }
+      newArr = newArr.filter(Boolean)
       return newArr.join(' | ')
     },
     // 获取非Dicom检查信息
@@ -406,24 +359,29 @@ export default {
   height: 100%;
   padding: 10px;
   display: flex;
+
   ::-webkit-scrollbar {
     width: 7px;
     height: 7px;
   }
+
   ::-webkit-scrollbar-thumb {
     border-radius: 10px;
     background: #d0d0d0;
   }
+
   ::v-deep .el-card__body {
     padding: 0px;
   }
 }
+
 .study-desc {
   padding: 10px 5px;
   line-height: 20px;
   background-color: #d5d5d5;
   font-weight: 500;
 }
+
 .left {
   width: 220px;
   height: 100%;
@@ -434,6 +392,7 @@ export default {
     display: flex;
     flex-direction: column;
   }
+
   .title {
     height: 40px;
     line-height: 40px;
@@ -443,6 +402,7 @@ export default {
     background-color: #4e4e4e;
     color: #ffffff;
   }
+
   .left-content {
     flex: 1;
     overflow-y: auto;
@@ -474,6 +434,7 @@ export default {
     // margin-bottom: 5px;
     padding-left: 5px;
   }
+
   .img-text {
     display: inline-block;
     width: calc(100% - 60px);
@@ -481,33 +442,41 @@ export default {
     height: 50px;
     line-height: 50px;
     overflow: hidden;
-    text-overflow: ellipsis; /* 用省略号表示溢出的文本 */
+    text-overflow: ellipsis;
+    /* 用省略号表示溢出的文本 */
     white-space: nowrap;
   }
+
   .img-box:nth-last-child(1) {
     margin-bottom: 0px;
   }
+
   .is-boxActive {
     // border-color: #409eff;
     color: #409eff;
   }
+
   .is-boxActiv:after {
     opacity: 0;
   }
 }
+
 .right {
   flex: 1;
   height: 100%;
   margin-left: 10px;
+
   ::v-deep .el-card__body {
     height: 100%;
     width: 100%;
   }
 }
+
 .switchBox {
   width: 100%;
   margin: 5px 0;
   color: #4e4e4e;
+
   .item {
     display: flex;
     align-items: center;
@@ -515,17 +484,21 @@ export default {
     margin-bottom: 5px;
   }
 }
+
 .file-image {
   width: 50px;
   height: 50px;
 }
+
 ::v-deep .el-collapse-item__header {
   background-color: #d5d5d5;
 }
+
 ::v-deep .el-collapse-item__header {
   min-height: 48px;
   height: auto;
 }
+
 ::v-deep .el-collapse-item__content {
   padding-bottom: 0;
 }

src/views/research-mobile/components/BasicInfo.vue

@@ -172,6 +172,13 @@ export default {
         ],
         Phone: [
           { required: true, validator: checkPhone, trigger: 'blur' }
+        ],
+        Email: [
+          {
+            pattern: new RegExp(this.$reg().EmailRegexStr),
+            message: 'Please input the correct email address',
+            trigger: 'blur,change',
+          }
         ]
       },
       siteOptions: [],

src/views/research-mobile/components/HistoricalParticipantForm.vue

@@ -117,6 +117,9 @@ export default {
       } else {
         var reg =
           /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
+        if (this.$reg().EmailRegexStr) {
+          reg = new RegExp(this.$reg().EmailRegexStr)
+        }
         if (this.form.Email && reg.test(this.form.Email)) {
           this.sendDisabled = false
           callback()

src/views/research-mobile/components/ParticipantForm.vue

@@ -136,6 +136,9 @@ export default {
       } else {
         var reg =
           /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
+        if (this.$reg().EmailRegexStr) {
+          reg = new RegExp(this.$reg().EmailRegexStr)
+        }
         if (this.form.Email && reg.test(this.form.Email)) {
           this.sendDisabled = false
           callback()

src/views/research-mobile/login.vue

@@ -158,6 +158,9 @@ export default {
         callback(new Error(this.$t('trials:researchForm:formRule:specify')))
       } else {
         var reg = /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
+        if (this.$reg().EmailRegexStr) {
+          reg = new RegExp(this.$reg().EmailRegexStr)
+        }
         if (this.form.EmailOrPhone && reg.test(this.form.EmailOrPhone)) {
           callback()
         } else {
@@ -170,6 +173,9 @@ export default {
         callback(new Error(this.$t('trials:researchForm:formRule:specify')))
       } else {
         var reg = /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
+        if (this.$reg().EmailRegexStr) {
+          reg = new RegExp(this.$reg().EmailRegexStr)
+        }
         if (this.form.ReplaceUserEmailOrPhone && reg.test(this.form.ReplaceUserEmailOrPhone)) {
           callback()
         } else {

src/views/research/components/BaseInfo.vue

@@ -18,19 +18,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,88 +33,81 @@
       <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>
     <!-- 联系邮箱 -->
-    <el-form-item :label="$t('trials:researchForm:form:contactorEmail')">
+    <el-form-item :label="$t('trials:researchForm:form:contactorEmail')" prop="Email">
       <el-input v-model="form.Email" disabled />
     </el-form-item>
 
     <!-- <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,
@@ -183,6 +167,13 @@ export default {
         ],
         Phone: [
           { required: true, validator: checkPhone, trigger: 'blur' }
+        ],
+        Email: [
+          {
+            pattern: new RegExp(this.$reg().EmailRegexStr),
+            message: 'Please input the correct email address',
+            trigger: 'blur,change',
+          }
         ]
       },
       siteOptions: [],
@@ -190,10 +181,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) => {

src/views/research/components/HistoricalParticipantForm.vue

@@ -108,6 +108,9 @@ export default {
       } else {
         var reg =
           /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
+        if (this.$reg().EmailRegexStr) {
+          reg = new RegExp(this.$reg().EmailRegexStr)
+        }
         if (this.form.Email && reg.test(this.form.Email)) {
           this.sendDisabled = false
           callback()

src/views/research/components/ParticipantForm.vue

@@ -139,6 +139,9 @@ export default {
       } else {
         var reg =
           /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
+        if (this.$reg().EmailRegexStr) {
+          reg = new RegExp(this.$reg().EmailRegexStr)
+        }
         if (this.form.Email && reg.test(this.form.Email)) {
           this.sendDisabled = false
           callback()

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);
     }

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() {
@@ -373,37 +338,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);
     }

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>
           <!-- 中心编号 -->
@@ -54,13 +43,14 @@
               {{ $t('trials:researchForm:button:updateQsForm') }}
             </el-link>
             <!-- 取消更新调研表 -->
-            <el-link v-else type="primary" @click="form.IsUpdate = false;form.ReplaceUserEmailOrPhone=''">
+            <el-link v-else type="primary" @click="form.IsUpdate = false; form.ReplaceUserEmailOrPhone = ''">
               {{ $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>
@@ -131,6 +117,9 @@ export default {
         callback(new Error(this.$t('trials:researchForm:formRule:specify')))
       } else {
         var reg = /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
+        if (this.$reg().EmailRegexStr) {
+          reg = new RegExp(this.$reg().EmailRegexStr)
+        }
         if (this.form.EmailOrPhone && reg.test(this.form.EmailOrPhone)) {
           // this.sendDisabled = false
           callback()
@@ -145,6 +134,9 @@ export default {
         callback(new Error(this.$t('trials:researchForm:formRule:specify')))
       } else {
         var reg = /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
+        if (this.$reg().EmailRegexStr) {
+          reg = new RegExp(this.$reg().EmailRegexStr)
+        }
         if (this.form.ReplaceUserEmailOrPhone && reg.test(this.form.ReplaceUserEmailOrPhone)) {
           callback()
         } else {
@@ -197,7 +189,8 @@ export default {
       timer: null,
       msg: '',
       lang: 'zh',
-      isHaveSiteSurveyRecord: false
+      isHaveSiteSurveyRecord: false,
+      isUpload: false
     }
   },
   computed: {
@@ -215,6 +208,14 @@ 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) this.form.EmailOrPhone = email
+    }
   },
   methods: {
     ...mapMutations({ setLanguage: 'lang/setLanguage' }),
@@ -229,6 +230,9 @@ export default {
             this.form[key] = Result[key]
           }
         })
+        if (this.isUpload) {
+          this.handleSiteChange(this.form.TrialSiteId)
+        }
         this.loading = false
       }).catch(() => { this.loading = false })
     },
@@ -339,8 +343,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;