自定义阅片样式更改

# Conflicts:
#	src/views/trials/trials-panel/setting/personnel-manage/components/site.vue

src/App.vue

@@ -3,6 +3,7 @@
     <router-view />
     <div
       v-show="show"
+      v-if="$route.matched.length > 0"
       v-adaptive
       @click="openI18n"
       style="
@@ -81,7 +82,7 @@
         >
       </div>
     </el-drawer>
-    <feedBack/>
+    <feedBack v-if="$route.matched.length > 0" />
   </div>
 </template>
 
@@ -91,12 +92,12 @@ import {
   getFrontInternationalizationList,
 } from "@/api/dictionary/dictionary";
 import { getTrialExtralConfig } from "@/api/trials";
-import feedBack from '@/views/trials/trials-layout/components/feedBack'
+import feedBack from "@/views/trials/trials-layout/components/feedBack";
 import Vue from "vue";
 import i18n from "./lang";
 export default {
   name: "App",
-  components: {feedBack},
+  components: { feedBack },
   data() {
     return {
       drawer: false,

src/api/export.js

@@ -160,3 +160,30 @@ export function getSubjectProgress_Export(param) {
     data: param
   })
 }
+// 导出项目列表
+export function getTrialList_Export(data) {
+  return requestDownload({
+    url: `/ExcelExport/getTrialList_Export`,
+    responseType: 'blob',
+    method: 'post',
+    data
+  })
+}
+// 导出培训记录
+export function pMTrainingRecordList_Export(data) {
+  return requestDownload({
+    url: `/ExcelExport/pMTrainingRecordList_Export`,
+    responseType: 'blob',
+    method: 'post',
+    data
+  })
+}
+// 导出影像指控
+export function qCVisitList_Export(data) {
+  return requestDownload({
+    url: `/ExcelExport/qCVisitList_Export`,
+    responseType: 'blob',
+    method: 'post',
+    data
+  })
+}

src/api/trials.js

@@ -3740,10 +3740,19 @@ export function addOrUpdateDicomAE(data) {
   })
 }
 // 测试dicomAE链接
-export function testSCPServerConnect(id) {
+export function testSCPServerConnect(data) {
   return request({
-    url: `/TrialDicomAE/testSCPServerConnect/${id}`,
-    method: 'get'
+    url: `/TrialDicomAE/testSCPServerConnect`,
+    method: 'post',
+    data
+  })
+}
+// 获取dicomAE默认值
+export function getTrialPacsConfigInfo(params) {
+  return request({
+    url: `/TrialConfig/getTrialPacsConfigInfo`,
+    method: 'get',
+    params
   })
 }
 // dicomAE配置签名
@@ -3802,6 +3811,14 @@ export function getVisitPatientStudyFilterList(data) {
     data
   })
 }
+// CRCpacs上传检查校验
+export function verifyPacsImage(data) {
+  return request({
+    url: `/Patient/verifyPacsImage`,
+    method: 'post',
+    data
+  })
+}
 // CRCpacs上传检查
 export function submitVisitStudyBinding(data) {
   return request({
@@ -3818,6 +3835,13 @@ export function getDicomModalityList(params) {
     params
   })
 }
+// 获取患者序列信息
+export function getPatientSeriesList(scpStudyId) {
+  return request({
+    url: `/Patient/getPatientSeriesList?scpStudyId=${scpStudyId}`,
+    method: 'get'
+  })
+}
 // 获取反馈列表
 export function getUserFeedBackList(data) {
   return request({

src/components/BaseForm/search-form.vue

@@ -120,9 +120,9 @@
           v-if="item.type === 'Daterange'"
           v-model="searchData[item.prop]"
           type="datetimerange"
-          range-separator="至"
-          start-placeholder="开始时间"
-          end-placeholder="结束时间"
+          :range-separator="$t('baseForm:daterange:rangeSeparator')"
+          :start-placeholder="$t('baseForm:daterange:startPlaceholder')"
+          :end-placeholder="$t('baseForm:daterange:startendPlaceholder')"
           value-format="yyyy-MM-dd HH:mm:ss"
           format="yyyy-MM-dd HH:mm:ss"
           :style="{ width: item.width }"

src/components/Dicom/DicomCanvas.vue

@@ -200,7 +200,7 @@ export default {
         this.stack.seriesId = dicomSeries.seriesId
         this.stack.seriesNumber = dicomSeries.seriesNumber
         this.stack.imageIds = dicomSeries.imageIds
-        this.stack.currentImageIdIndex = dicomSeries.imageIdIndex ? dicomSeries.imageIdIndex : 0
+        this.stack.currentImageIdIndex = dicomSeries.imageIdIndex && dicomSeries.imageIdIndex < dicomSeries.imageIds.length ? dicomSeries.imageIdIndex : 0
         this.stack.firstImageLoading = true
         this.stack.description = dicomSeries.description
         this.toolState.viewportInvert = false

src/components/Dicom/DicomViewer.vue

@@ -405,7 +405,8 @@ export default {
     loadImageStack(dicomSeries) {
       this.currentDicomCanvas.toolState.clipPlaying = false
       this.$nextTick(() => {
-        this.currentDicomCanvas.loadImageStack(dicomSeries)
+        let series = Object.assign({}, dicomSeries)
+        this.currentDicomCanvas.loadImageStack(series)
       })
     },
     loadOtherImageStack(seriesList) {
@@ -415,7 +416,8 @@ export default {
         Array.from(elements).forEach((element, index) => {
           const canvasIndex = element.getAttribute('data-index')
           if (index < seriesList.length && element.style.display !== 'none') {
-            this.$refs[`dicomCanvas${canvasIndex}`].loadImageStack(seriesList[index])
+            let series = Object.assign({}, seriesList[index])
+            this.$refs[`dicomCanvas${canvasIndex}`].loadImageStack(series)
           }
         })
       })

src/components/MFA/fun.js

@@ -2,12 +2,13 @@ import Vue from "vue";
 import MFACOMP from "./index.vue";
 
 const MFAConstructor = Vue.extend(MFACOMP);
-
+let MFAINSTANCELIST = [];
 const MFA = options => {
     const { UserId, username, EMail, callBack, cancelBack, status = 'login' } = options;
     if (!UserId) throw `UserId is requred.but ${UserId}`
     const id = `MFA${new Date().getTime()}`;
     const instance = new MFAConstructor();
+    MFAINSTANCELIST.push(instance)
     instance.id = id;
     instance.vm = instance.$mount();
     if (instance.vm.visible) return;
@@ -20,7 +21,17 @@ const MFA = options => {
         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;
 }
+MFA.close = () => {
+    if (MFAINSTANCELIST.length <= 0) return;
+    MFAINSTANCELIST.forEach(item => {
+        document.body.removeChild(item.vm.$el);
+        item.vm.$destroy();
+    })
+    MFAINSTANCELIST = [];
+}
 export default MFA;

src/components/MFA/index.vue

@@ -167,6 +167,7 @@ export default {
           this.timer = setInterval(() => {
             this.second--;
             if (this.second <= 0) {
+              this.flag = false;
               clearInterval(this.timer);
               this.timer = null;
             }
@@ -201,7 +202,7 @@ export default {
     margin-right: 5px;
   }
 }
-::v-deep .el-dialog__header{
+::v-deep .el-dialog__header {
   font-weight: bold;
 }
 </style>

src/components/UploadFile/index.vue

@@ -15,7 +15,7 @@
       accept=".pdf"
     >
       <el-button size="small" type="primary" :disabled="btnDisabled || $route.query.ReviewStatus === '1'" >{{ $t('system:GcpCertificate:upload:Upload') }}</el-button>
-      <span slot="tip" class="el-upload__tip">{{$t('system:GcpCertificate:tap:must2') }}</span>
+      <span slot="tip" class="el-upload__tip">{{$t('system:tip:file:pdf') }}</span>
     </el-upload>
   </div>
 </template>

src/components/feedBack/fun.js

@@ -1,18 +1,18 @@
 import Vue from "vue";
 import FEEDBACKCOMP from "./index.vue";
 const FBConstructor = Vue.extend(FEEDBACKCOMP);
-
+let FBCINSTANCELIST = [];
 const FB = options => {
-    const { type, callBack, cancelBack, trialId = null, Id = null, visitTaskId = null } = options;
+    const { type, callBack, cancelBack, trialId = null, Id = null, visitTaskId = null, SubjectVisitId = null } = options;
     if (!type) throw `type is requred.but ${type}`
     const id = `FB${new Date().getTime()}`;
     const instance = new FBConstructor();
+    FBCINSTANCELIST.push(instance);
     instance.id = id;
     instance.vm = instance.$mount();
     if (instance.vm.visible) return;
     document.body.appendChild(instance.vm.$el);
-    console.log(type);
-    instance.vm.open({ type, trialId, Id, visitTaskId });
+    instance.vm.open({ type, trialId, Id, visitTaskId, SubjectVisitId });
     instance.vm.$on("success", (Id) => {
         if (callBack) callBack();
 
@@ -20,8 +20,18 @@ const FB = options => {
     instance.vm.$on("closed", () => {
         document.body.removeChild(instance.vm.$el);
         instance.vm.$destroy();
+        let index = FBCINSTANCELIST.findIndex(item => item.id === id);
+        FBCINSTANCELIST.splice(index, 1)
         if (cancelBack) cancelBack()
     });
     return instance.vm;
 }
+FB.close = () => {
+    if (FBCINSTANCELIST.length <= 0) return;
+    FBCINSTANCELIST.forEach(item => {
+        document.body.removeChild(item.vm.$el);
+        item.vm.$destroy();
+    })
+    FBCINSTANCELIST = [];
+}
 export default FB;

src/components/feedBack/index.vue

@@ -1,18 +1,20 @@
 <template>
   <!--FEEDBACK-->
-  <div v-if="visible" @click.stop="() => false">
+  <div v-if="visible" @click.stop="() => false" class="feedBack-box">
+    <div class="feedBack-box-modal"></div>
     <el-dialog
       :visible.sync="visible"
       v-dialogDrag
-      width="540px"
+      width="800px"
       :close-on-click-modal="false"
       @close="cancel"
+      :modal="false"
     >
       <div slot="title">
         {{ title }}
       </div>
       <!-- 项目详情 -->
-      <div class="trialsBox" v-if="visitTaskId">
+      <div class="trialsBox" v-if="visitTaskId || SubjectVisitId">
         <el-form
           label-position="right"
           :model="form"
@@ -33,7 +35,7 @@
             <span>{{ form.TrialSiteCode }}</span>
           </el-form-item>
           <el-form-item :label="$t('feedBack:trials:visit')" style="width: 40%">
-            <span>{{ form.SubjectVisitName }}</span>
+            <span>{{ form.SubjectCode }} - {{ form.SubjectVisitName }}</span>
           </el-form-item>
         </el-form>
       </div>
@@ -58,7 +60,11 @@
           prop="QuestionType"
           v-if="type === 'feedback' && trialId"
         >
-          <el-select v-model="form.QuestionType" style="width: 100%">
+          <el-select
+            v-model="form.QuestionType"
+            style="width: 100%"
+            popper-class="feedBack-select-box"
+          >
             <el-option
               v-for="item in QuestionTypeOptions"
               :key="item.id"
@@ -97,6 +103,8 @@
         <el-form-item :label="$t('feedBack:form:screenshot')" prop="screenshot">
           <uploadImage
             :path.sync="form.ScreenshotList"
+            :isUpload.sync="loading"
+            :trialId="trialId"
             :disabled="type === 'detail'"
             ref="uploadImage"
           />
@@ -179,6 +187,7 @@ export default {
         TrialSiteId: null,
         TrialId: null,
         VisitTaskId: null,
+        SubjectVisitId: null,
         ScreenshotList: [],
         ScreenshotListStr: null,
       },
@@ -209,6 +218,7 @@ export default {
           },
         ],
       },
+      isUpload: false,
     };
   },
   computed: {
@@ -242,16 +252,15 @@ export default {
   },
   methods: {
     open(data) {
-      let { type, trialId, Id, visitTaskId } = data;
+      let { type, trialId, Id, visitTaskId, SubjectVisitId } = data;
       this.type = type;
       this.trialId = trialId;
       this.Id = Id;
       this.visitTaskId = visitTaskId;
-      console.log(visitTaskId, "visitTaskId");
+      this.SubjectVisitId = SubjectVisitId;
       if (visitTaskId) {
         this.isImgfail = true;
       }
-      console.log(this.isImgfail, "isImgfail");
       this.setTypeOption();
       if (!Id) {
         this.title = this.setTitle();
@@ -275,6 +284,9 @@ export default {
         if (this.visitTaskId) {
           this.form.VisitTaskId = this.visitTaskId;
         }
+        if (this.SubjectVisitId) {
+          this.form.SubjectVisitId = this.SubjectVisitId;
+        }
         if (this.Id) {
           this.form.Id = this.Id;
         }
@@ -303,7 +315,8 @@ export default {
         if (res.IsSuccess) {
           this.$message.success(this.$t("feedBack:changeState:success"));
           this.$emit("success");
-          this.cancel();
+          // this.cancel();
+          this.getInfo(this.Id, this.visitTaskId);
         }
       } catch (err) {
         console.log(err);
@@ -326,6 +339,9 @@ export default {
           if (res.Result.VisitTaskId) {
             this.visitTaskId = res.Result.VisitTaskId;
           }
+          if (res.Result.SubjectVisitId) {
+            this.SubjectVisitId = res.Result.SubjectVisitId;
+          }
           let code = this.$fd("UserType", res.Result.UserTypeEnum);
           this.title = this.setTitle(code, res.Result.FeedBackFullName);
           if (visitTaskId) {

src/components/feedBack/uploadImage.vue

@@ -15,13 +15,24 @@
       list-type="picture-card"
     >
       <i slot="default" class="el-icon-plus"></i>
-      <div slot="file" slot-scope="{ file }">
-        <viewer :ref="file.url" :images="fileList">
+      <div slot="file" slot-scope="{ file }" style="width: 100%; height: 100%">
+        <viewer
+          :ref="file.url"
+          :images="fileList"
+          style="
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            width: 100%;
+            height: 100%;
+          "
+        >
           <img
             class="el-upload-list__item-thumbnail"
             :src="`${file.url}`"
             alt=""
             crossorigin="anonymous"
+            style="max-width: 100%; max-height: 100%"
           />
           <span class="el-upload-list__item-actions" v-if="!isUpload">
             <span
@@ -61,12 +72,19 @@ export default {
       required: true,
       default: false,
     },
+    isUpload: {
+      required: true,
+      default: false,
+    },
+    trialId: {
+      type: String,
+      default: "",
+    },
   },
   data() {
     return {
       fileList: [],
       btnDisabled: false,
-      isUpload: false,
     };
   },
   methods: {
@@ -94,10 +112,11 @@ export default {
     // 上传oss
     async uploadToOSS(name, file) {
       try {
-        let res = await this.OSSclient.put(
-          `/System/GeneralDocuments/${name}`,
-          file
-        );
+        let defaultPath = "/System/FeedBack/";
+        if (this.trialId) {
+          defaultPath = `/${this.trialId}/FeedBack/`;
+        }
+        let res = await this.OSSclient.put(`${defaultPath}${name}`, file);
         return res;
       } catch (err) {
         console.log(err);
@@ -122,19 +141,29 @@ export default {
     },
     async uploadFile(param) {
       var fileName = param.file.name;
-      this.isUpload = true;
+      this.$emit("update:isUpload", true);
       this.btnDisabled = true;
+      this.fileList.push({
+        url: param.file.url,
+        path: fileName,
+        uid: param.file.uid,
+      });
       let file = await this.fileToBlob(param.file);
       let res = await this.uploadToOSS(fileName, file);
       this.btnDisabled = false;
-      if (!res) return (this.isUpload = false);
-      this.fileList.push({
-        url: this.OSSclientConfig.basePath + res.name,
-        path: res.name,
-        uid: param.file.uid,
-      });
+      let index = this.fileList.findIndex(
+        (item) => item.uid === param.file.uid
+      );
+      if (!res) {
+        if (index >= 0) {
+          this.fileList.splice(index, 1);
+        }
+        return this.$emit("update:isUpload", false);
+      }
+      this.fileList[index].url = this.OSSclientConfig.basePath + res.name;
+      this.fileList[index].path = res.name;
       this.$emit("update:path", [...this.path, res.name]);
-      this.isUpload = false;
+      this.$emit("update:isUpload", false);
       return false;
     },
     beforeUpload(file, fileList) {
@@ -216,4 +245,8 @@ export default {
   align-items: center;
   justify-content: center;
 }
+.el-upload-list--picture-card .el-upload-list__item-thumbnail {
+  width: auto;
+  height: auto;
+}
 </style>

src/components/feedBackTable/fun.js

@@ -1,23 +1,35 @@
 import Vue from "vue";
 import FEEDBACKCOMP from "./index.vue";
 const FBConstructor = Vue.extend(FEEDBACKCOMP);
-
+let FBCTABLEINSTANCELIST = [];
 const FBT = (options = {}) => {
-    const { data = {} } = options;
+    const { data = {}, callBack } = options;
     // if (!UserId) throw `UserId is requred.but ${UserId}`
     const id = `FB${new Date().getTime()}`;
     const instance = new FBConstructor();
+    FBCTABLEINSTANCELIST.push(instance);
     instance.id = id;
     instance.vm = instance.$mount();
     if (instance.vm.visible) return;
     document.body.appendChild(instance.vm.$el);
     instance.vm.open({ ...data });
     instance.vm.$on("success", (Id) => {
+        if (callBack) callBack();
     });
     instance.vm.$on("closed", () => {
         document.body.removeChild(instance.vm.$el);
         instance.vm.$destroy();
+        let index = FBCTABLEINSTANCELIST.findIndex(item => item.id === id);
+        FBCTABLEINSTANCELIST.splice(index, 1)
     });
     return instance.vm;
 }
+FBT.close = () => {
+    if (FBCTABLEINSTANCELIST.length <= 0) return;
+    FBCTABLEINSTANCELIST.forEach(item => {
+        document.body.removeChild(item.vm.$el);
+        item.vm.$destroy();
+    })
+    FBCTABLEINSTANCELIST = [];
+}
 export default FBT;

src/components/feedBackTable/index.vue

@@ -1,16 +1,17 @@
 <template>
-  <div v-if="visible" @click.stop="() => false">
+  <div v-if="visible" @click.stop="() => false" class="feedBack-box">
     <el-dialog
       :visible.sync="visible"
       v-dialogDrag
       width="1200px"
       :close-on-click-modal="false"
       @close="cancel"
+      :fullscreen="true"
     >
       <div slot="title">
         {{ title }}
       </div>
-      <feedBackTable :trialId="trialId" />
+      <feedBackTable :trialId="trialId" @success="success" />
     </el-dialog>
   </div>
 </template>
@@ -46,12 +47,16 @@ export default {
         return `${this.$t("feedBack:table:title")}`;
       }
     },
+    success() {
+      this.$emit("success");
+    },
   },
 };
 </script>
-<style lang="scss" scoped>
-::v-deep .el-dialog__body {
-  padding-bottom: 0;
-  height: 500px;
-}
+// <style lang="scss" scoped>
+// ::v-deep .el-dialog__body {
+//   padding-bottom: 0;
+//   height: 500px;
+// }
+//
 </style>

src/components/videos/index.vue

@@ -1,180 +0,0 @@
-<template>
-  <div style="text-align: center">
-    <div style="display: flex;justify-content: center">
-      <video v-if="videoSrc" id="video" controls crossorigin="anonymous" width="400" height="270"">
-        <source :src="videoSrc" type="video/mp4">
-        无法播放，请点击转码
-      </video>
-      <div v-else style="border:2px dashed #999;border-radius: 10px;cursor:pointer;width:400px;height:270px;display: flex;justify-content: center;align-items: center" @click="$refs.fileInput.click()">
-        请选择视频文件
-      </div>
-    </div>
-    <input v-show="false" ref="fileInput" type="file" accept="video/*" @change="fileChange">
-    <div v-if="isVideoToMp4" style="display: flex;align-items: center;justify-content: right;margin-top: 10px;">
-      <div>转码进度: </div>
-      <el-progress style="width: 200px" :percentage="percentage" :format="() => {return percentage + '%'}" />
-    </div>
-    <div style="margin-top: 10px;display: flex;justify-content: right;align-items: center">
-      <el-button size="small" type="primary" :disabled="isVideoToMp4 || isDisabled" @click="$refs.fileInput.click()">选择文件</el-button>
-      <el-button v-if="isNeedToMp4" size="small" type="primary" :disabled="(videoSrc ? false : true) || isVideoToMp4 || isDisabled" @click="videoToMp4">转码</el-button>
-      <el-button size="small" type="primary" :disabled="(videoSrc ? false : true) || isVideoToMp4 || isDisabled" @click="upload">上传</el-button>
-    </div>
-  </div>
-</template>
-
-<script>
-import { createFFmpeg, fetchFile } from '@ffmpeg/ffmpeg'
-const ffmpeg = createFFmpeg({
-  log: true,
-  corePath: './ffmpeg-core.js'
-})
-
-export default {
-  props: {
-  },
-  data() {
-    return {
-      isDisabled: false,
-      imgList: [],
-      fileObj: null,
-      videoList: [],
-      videoSrc: null,
-      file: null,
-      dataBuffer: null,
-      percentage: 0,
-      isVideoToMp4: false,
-      isNeedToMp4: false
-    }
-  },
-  watch: {
-  },
-  mounted() {
-  },
-  methods: {
-    async uploadVideo(objectName, file) {
-      try {
-        this.isDisabled = true
-        const result = await this.OSSclient.put(objectName, file)
-        this.$emit('uploadOver', true, result, this.file.name)
-      } catch (e) {
-        console.log(e)
-        this.isDisabled = false
-        this.$emit('uploadOver', false)
-      }
-    },
-    upload() {
-      if (document.querySelector('#video').readyState === 0 && document.querySelector('#video').buffered.length === 0) {
-        this.$alert(this.$t('components:uploadvideo:message:xf2'))
-        this.isNeedToMp4 = true
-        return
-      }
-      this.uploadVideo(`file/videofile/${this.file.name.split('.')[0]}${new Date().getTime()}.mp4`, this.dataBuffer)
-    },
-    async videoToMp4() {
-      // 页面是否在安全上下文中
-      // https 或者 本地开发环境才是安全上下文
-      if (!window.isSecureContext) {
-        this.$alert(this.$t('components:uploadvideo:message:xf3'))
-        return
-      }
-      // 顶部文档是否开启跨源隔离
-      if (!window.crossOriginIsolated) {
-        this.$alert(this.$t('components:uploadvideo:message:xf4'))
-        return
-      }
-      this.$message.success(this.$t('components:uploadvideo:message:xf5'))
-      if (!ffmpeg.isLoaded()) {
-        await ffmpeg.load()
-      }
-      this.percentage = 0
-      this.isVideoToMp4 = true
-      ffmpeg.setProgress(({ ratio }) => {
-        console.log(ratio)
-        if (ratio * 100 < 1) {
-          this.percentage = parseInt(0)
-        } else {
-          this.percentage = parseInt(ratio * 100)
-        }
-      })
-      ffmpeg.FS('writeFile', 'input.mp4', await fetchFile(this.videoSrc))
-      await ffmpeg.run('-i', 'input.mp4', 'output.mp4')
-      this.videoSrc = null
-      const data = ffmpeg.FS('readFile', 'output.mp4')
-      this.dataBuffer = new Blob([data.buffer], { type: 'video/mp4' })
-      this.$message.success(this.$t('components:uploadvideo:message:xf6'))
-      setTimeout(() => {
-        this.videoSrc = URL.createObjectURL(this.dataBuffer)
-        this.isVideoToMp4 = false
-        this.isNeedToMp4 = false
-        process.exit(0)
-      }, 50)
-    },
-    fileChange(e) {
-      this.videoSrc = null
-      const files = e.target.files || e.dataTransfer.files
-      this.file = files[0]
-      var reader = new FileReader()
-      reader.readAsArrayBuffer(this.file)
-      reader.onloadend = async(e) => {
-        this.dataBuffer = new Blob([e.target.result], { type: 'video/mp4' })
-        this.videoSrc = URL.createObjectURL(this.dataBuffer)
-        this.$message.success(this.$t('components:uploadvideo:message:xf7'))
-        e.target.files = []
-      }
-    },
-    deleteimg(index) {
-      this.imgList.splice(index, 1)
-    },
-    jietu() {
-      this.screenShot('video')
-    },
-    screenShot(id) {
-      var player = document.getElementById(id)
-      var canvas = document.createElement('canvas')
-      var img = document.createElement('img')
-      canvas.width = player.videoWidth
-      canvas.height = player.videoHeight
-      canvas.getContext('2d').drawImage(player, 0, 0, canvas.width, canvas.height)
-      var dataURL = canvas.toDataURL('image/png')
-      img.src = dataURL
-      img.width = player.clientWidth
-      img.height = player.clientHeight
-      img.style.objectFit = 'contain'
-      this.imgList.push(dataURL)
-    },
-    downFile(data, fileName) {
-      var save_link = document.createElementNS(
-        'http://www.jumi.com',
-        'a'
-      )
-      save_link.href = data
-      save_link.download = fileName
-      var event = document.createEvent('MouseEvents')
-      event.initMouseEvent(
-        'click',
-        true,
-        false,
-        window,
-        0,
-        0,
-        0,
-        0,
-        0,
-        false,
-        false,
-        false,
-        false,
-        0,
-        null
-      )
-      save_link.dispatchEvent(event)
-    }
-  }
-}
-</script>
-<style lang='scss'>
-  #cutImage{
-    img{
-    }
-  }
-</style>

src/main.js

@@ -1,10 +1,9 @@
 
 import Vue from 'vue'
 import 'normalize.css/normalize.css' // A modern alternative to CSS resets
-
+// import { createVersionPolling } from "@/utils/version-polling.esm.js";
 import ElementUI, { MessageBox } from 'element-ui'
 import { getBasicDataAllSelect, getFrontInternationalizationList, getCurrentPublishInfo } from '@/api/dictionary/dictionary'
-import { sendMFAEmail } from "@/api/user.js";
 import { resetReadingRestTime } from '@/api/trials/reading'
 // import 'element-ui/lib/theme-chalk/index.css'
 import './assets/css/theme-blue/index.css' // 浅绿色主题
@@ -308,7 +307,7 @@ async function VueInit() {
   if (eval(process.env.VUE_APP_LOGIN_FOR_PERMISSION)) {
     setInterval(() => {
       var lang = zzSessionStorage.getItem('lang') ? zzSessionStorage.getItem('lang') : 'zh'
-      if (_vm.$route.path === '/ReviewersResearchForm' || _vm.$route.path === '/ReviewersResearch' || _vm.$route.path === '/login' || _vm.$route.path === '/researchForm' || _vm.$route.path === '/researchLogin' || _vm.$route.path === '/email-recompose' || _vm.$route.path === '/recompose' || _vm.$route.path === '/resetpassword' || _vm.$route.path === '/error') {
+      if (_vm.$route.path === '/ReviewersResearchForm' || _vm.$route.path === '/ReviewersResearch' || _vm.$route.path === '/login' || _vm.$route.path === '/researchForm' || _vm.$route.path === '/researchDetail_m' || _vm.$route.path === '/researchLogin_m' || _vm.$route.path === '/researchLogin' || _vm.$route.path === '/email-recompose' || _vm.$route.path === '/recompose' || _vm.$route.path === '/resetpassword' || _vm.$route.path === '/error') {
         return
       }
       if (_vm.$store.state.user.userId !== zzSessionStorage.getItem('userId')) {
@@ -372,7 +371,7 @@ async function VueInit() {
   window.VUE_APP_COMPANY_NAME = process.env.VUE_APP_COMPANY_NAME;
   waitOperate(eval(process.env.VUE_APP_LOGOUT_FOR_PERMISSION) ? () => {
     var lang = zzSessionStorage.getItem('lang') ? zzSessionStorage.getItem('lang') : 'zh'
-    if (_vm.$store.state.trials.unlock || _vm.$route.path === '/ReviewersResearchForm' || _vm.$route.path === '/ReviewersResearch' || _vm.$route.path === '/login' || _vm.$route.path === '/researchForm' || _vm.$route.path === '/researchLogin' || _vm.$route.path === '/email-recompose' || _vm.$route.path === '/recompose' || _vm.$route.path === '/resetpassword' || _vm.$route.path === '/error') {
+    if (_vm.$store.state.trials.unlock || _vm.$route.path === '/ReviewersResearchForm' || _vm.$route.path === '/ReviewersResearch' || _vm.$route.path === '/login' || _vm.$route.path === '/researchForm' || _vm.$route.path === '/researchDetail_m' || _vm.$route.path === '/researchLogin_m' || _vm.$route.path === '/researchLogin' || _vm.$route.path === '/email-recompose' || _vm.$route.path === '/recompose' || _vm.$route.path === '/resetpassword' || _vm.$route.path === '/error') {
       count = 0;
       localStorage.setItem('count', '0')
       return
@@ -382,6 +381,9 @@ async function VueInit() {
       if (_vm.$msgbox) {
         _vm.$msgbox.close();
       }
+      _vm.$FB.close();
+      _vm.$FBT.close();
+      _vm.$MFA.close();
       isOpen = false
       isLock = null
       zzSessionStorage.removeItem('isLock')
@@ -398,7 +400,7 @@ async function VueInit() {
   } : () => { }, process.env.VUE_APP_LOGOUT_FOR_TIME,
     eval(process.env.VUE_APP_LOCK_FOR_PERMISSION) ? () => {
       var lang = zzSessionStorage.getItem('lang') ? zzSessionStorage.getItem('lang') : 'zh'
-      if (_vm.$store.state.trials.unlock || _vm.$route.path === '/ReviewersResearchForm' || _vm.$route.path === '/ReviewersResearch' || _vm.$route.path === '/login' || _vm.$route.path === '/researchForm' || _vm.$route.path === '/researchLogin' || _vm.$route.path === '/email-recompose' || _vm.$route.path === '/recompose' || _vm.$route.path === '/resetpassword' || _vm.$route.path === '/error') {
+      if (_vm.$store.state.trials.unlock || _vm.$route.path === '/ReviewersResearchForm' || _vm.$route.path === '/ReviewersResearch' || _vm.$route.path === '/login' || _vm.$route.path === '/researchForm' || _vm.$route.path === '/researchDetail_m' || _vm.$route.path === '/researchLogin_m' || _vm.$route.path === '/researchLogin' || _vm.$route.path === '/email-recompose' || _vm.$route.path === '/recompose' || _vm.$route.path === '/resetpassword' || _vm.$route.path === '/error') {
         count = 0;
         localStorage.setItem('count', '0')
         if (_vm.$route.path === '/login') {
@@ -451,22 +453,22 @@ async function VueInit() {
                   done()
                 }, 500)
               }
-              if (eval(process.env.VUE_APP_LOCK_FOR_PERMISSION_MFA)) {
-                sendMFAEmail({ UserId: my_userid, MfaType: 1 }).then((res) => {
-                  done();
-                  Vue.prototype.$MFA({
-                    status: "lock",
-                    UserId: my_userid,
-                    EMail: res.Result,
-                    username: my_username,
-                    callBack: () => {
-                      closeLock(_vm)
-                    },
-                  })
-                })
-              } else {
-                closeLock(_vm)
-              }
+              // if (eval(process.env.VUE_APP_LOCK_FOR_PERMISSION_MFA)) {
+              //   sendMFAEmail({ UserId: my_userid, MfaType: 1 }).then((res) => {
+              //     done();
+              //     Vue.prototype.$MFA({
+              //       status: "lock",
+              //       UserId: my_userid,
+              //       EMail: res.Result,
+              //       username: my_username,
+              //       callBack: () => {
+              //         closeLock(_vm)
+              //       },
+              //     })
+              //   })
+              // } else {
+              closeLock(_vm)
+              // }
 
             } else {
               // console.log(111)
@@ -529,5 +531,21 @@ async function VueInit() {
     } : () => { }, process.env.VUE_APP_LOCK_FOR_TIME)
 }
 VueInit()
+// createVersionPolling({
+//   appETagKey: "__APP_ETAG__",
+//   pollingInterval: 5 * 60 * 1000, // 单位为毫秒
+//   silent: process.env.NODE_ENV === false, // 开发环境下不检测
+//   onUpdate: (self) => {
+//     // 当检测到有新版本时，执行的回调函数，可以在这里提示用户刷新页面
+//     const result = confirm(_vm.$t("versionPolling:tip"));
+//     if (result) {
+//       self.onRefresh();
+//     } else {
+//       self.onCancel();
+//     }
+//     // 强制更新可以用alert
+//     // alert('有新版本，请刷新页面');
+//   },
+// });
 
 

src/store/modules/trials.js

@@ -11,7 +11,8 @@ const getDefaultState = () => {
     config: {},
     uploadTip: null,
     timer: null,
-    whiteList: []
+    whiteList: [],
+    checkTaskId: null
   }
 }
 

src/styles/index.scss

@@ -9,7 +9,7 @@ body {
   -moz-osx-font-smoothing: grayscale;
   -webkit-font-smoothing: antialiased;
   text-rendering: optimizeLegibility;
-  font-family: "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif;
+  font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Arial, sans-serif;
   // font-family:"Helvetica Neue", Helvetica, Arial, sans-serif;
   // font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "PingFang SC",
   //   "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial,
@@ -52,6 +52,7 @@ a:hover {
 div:focus {
   outline: none;
 }
+
 body .el-table th.gutter {
   display: table-cell !important;
 }
@@ -66,6 +67,7 @@ body .el-table th.gutter {
     height: 0;
   }
 }
+
 .el-loading-mask {
   background-color: rgba(255, 255, 255, 0.5);
 }
@@ -80,6 +82,7 @@ body .el-table th.gutter {
   .table-container {
     height: calc(100% - 100px);
   }
+
   // .pagination-container{
   //   text-align: right;
   // }
@@ -92,10 +95,12 @@ body .el-table th.gutter {
       border-left: 3px solid #0fc8e0;
       font-size: 13px;
       margin-bottom: 10px;
+
       p {
         margin: 0;
         padding-left: 5px;
       }
+
       .add {
         position: absolute;
         right: 10px;
@@ -104,9 +109,11 @@ body .el-table th.gutter {
         margin-top: -15px;
       }
     }
+
     .el-dialog__body {
       padding: 0 10px;
     }
+
     .el-date-editor.el-input,
     .el-date-editor.el-input__inner,
     .el-select {
@@ -114,167 +121,232 @@ body .el-table th.gutter {
     }
   }
 }
+
 .data-list {
   display: flex;
   flex-direction: column;
   flex: 1;
+
   .toolbar {
     display: flex;
   }
+
   .data-table {
     flex: 1;
     padding: 5px 0px;
   }
+
   .pagination {
     height: 32px;
     text-align: right;
   }
 }
 
-.is-fullscreen{
-  .el-dialog__headerbtn{
-    top:10px;
+.is-fullscreen {
+  .el-dialog__headerbtn {
+    top: 10px;
     font-size: 30px;
   }
-  .el-dialog__body{
+
+  .el-dialog__body {
     height: calc(100% - 70px);
     padding: 0 20px;
-    .base-modal-body{
+
+    .base-modal-body {
       padding: 10px 20px;
       height: 100%;
       overflow-y: auto;
     }
   }
-  .el-dialog__footer{
+
+  .el-dialog__footer {
     padding: 10px;
   }
-  .link-breadcrumb{
+
+  .link-breadcrumb {
     cursor: pointer;
     color: #428bca;
   }
 }
 
-.base-dialog-wrapper{
-  .el-dialog__header{
+.base-dialog-wrapper {
+  .el-dialog__header {
     padding: 15px;
   }
-  .base-dialog-body{
+
+  .base-dialog-body {
     border: 1px solid #e0e0e0;
-    padding:10px;
-    max-height:600px;
+    padding: 10px;
+    max-height: 600px;
     overflow-y: auto;
   }
-  .base-dialog-footer{
-    text-align:right;
-    margin-top:10px;
+
+  .base-dialog-footer {
+    text-align: right;
+    margin-top: 10px;
   }
-  .el-dialog__body{
-    padding:10px;
+
+  .el-dialog__body {
+    padding: 10px;
   }
-  .el-dialog__footer{
-      padding: 10px;
+
+  .el-dialog__footer {
+    padding: 10px;
   }
 }
-.el-descriptions{
-  box-sizing:border-box;
-  font-size:14px;
-  color:#303133
+
+.el-descriptions {
+  box-sizing: border-box;
+  font-size: 14px;
+  color: #303133
 }
-.el-descriptions__header{
-  display:flex;
-  justify-content:space-between;
-  align-items:center;
-  margin-bottom:20px
+
+.el-descriptions__header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 20px
 }
-.el-descriptions__title{
-  font-size:16px;
-  font-weight:700
+
+.el-descriptions__title {
+  font-size: 16px;
+  font-weight: 700
 }
-.el-descriptions__body{
-  color:#606266;
-  background-color:#fff
+
+.el-descriptions__body {
+  color: #606266;
+  background-color: #fff
 }
-.el-descriptions__body .el-descriptions__table{
-  border-collapse:collapse;
-  width:100%;
-  table-layout:fixed
+
+.el-descriptions__body .el-descriptions__table {
+  border-collapse: collapse;
+  width: 100%;
+  table-layout: fixed
 }
-.el-descriptions__body .el-descriptions__table .el-descriptions-item__cell{
-  box-sizing:border-box;
-  text-align:left;
-  font-weight:400;
-  line-height:1.5
+
+.el-descriptions__body .el-descriptions__table .el-descriptions-item__cell {
+  box-sizing: border-box;
+  text-align: left;
+  font-weight: 400;
+  line-height: 1.5
 }
-.el-descriptions__body .el-descriptions__table .el-descriptions-item__cell.is-left{
-  text-align:left
+
+.el-descriptions__body .el-descriptions__table .el-descriptions-item__cell.is-left {
+  text-align: left
 }
-.el-descriptions__body .el-descriptions__table .el-descriptions-item__cell.is-center{
-  text-align:center
+
+.el-descriptions__body .el-descriptions__table .el-descriptions-item__cell.is-center {
+  text-align: center
 }
-.el-descriptions__body .el-descriptions__table .el-descriptions-item__cell.is-right{
-  text-align:right
+
+.el-descriptions__body .el-descriptions__table .el-descriptions-item__cell.is-right {
+  text-align: right
 }
-.el-descriptions .is-bordered{
-  table-layout:auto
+
+.el-descriptions .is-bordered {
+  table-layout: auto
 }
-.el-descriptions .is-bordered .el-descriptions-item__cell{
-  border:1px solid #ebeef5;
-  padding:12px 10px
+
+.el-descriptions .is-bordered .el-descriptions-item__cell {
+  border: 1px solid #ebeef5;
+  padding: 12px 10px
 }
-.el-descriptions :not(.is-bordered) .el-descriptions-item__cell{
-  padding-bottom:12px
+
+.el-descriptions :not(.is-bordered) .el-descriptions-item__cell {
+  padding-bottom: 12px
 }
-.el-descriptions--medium.is-bordered .el-descriptions-item__cell{
-  padding:10px
+
+.el-descriptions--medium.is-bordered .el-descriptions-item__cell {
+  padding: 10px
 }
-.el-descriptions--medium:not(.is-bordered) .el-descriptions-item__cell{
-  padding-bottom:10px
+
+.el-descriptions--medium:not(.is-bordered) .el-descriptions-item__cell {
+  padding-bottom: 10px
 }
-.el-descriptions--small{
-  font-size:12px
+
+.el-descriptions--small {
+  font-size: 12px
 }
-.el-descriptions--small.is-bordered .el-descriptions-item__cell{
-  padding:8px 10px
+
+.el-descriptions--small.is-bordered .el-descriptions-item__cell {
+  padding: 8px 10px
 }
-.el-descriptions--small:not(.is-bordered) .el-descriptions-item__cell{
-  padding-bottom:8px
+
+.el-descriptions--small:not(.is-bordered) .el-descriptions-item__cell {
+  padding-bottom: 8px
 }
-.el-descriptions--mini{
-  font-size:12px
+
+.el-descriptions--mini {
+  font-size: 12px
 }
-.el-descriptions--mini.is-bordered .el-descriptions-item__cell{
-  padding:6px 10px
+
+.el-descriptions--mini.is-bordered .el-descriptions-item__cell {
+  padding: 6px 10px
 }
-.el-descriptions--mini:not(.is-bordered) .el-descriptions-item__cell{
-  padding-bottom:6px
+
+.el-descriptions--mini:not(.is-bordered) .el-descriptions-item__cell {
+  padding-bottom: 6px
 }
-.el-descriptions-item{
-  vertical-align:top
+
+.el-descriptions-item {
+  vertical-align: top
 }
-.el-descriptions-item__container{
-  display:flex
+
+.el-descriptions-item__container {
+  display: flex
 }
-.el-descriptions-item__container .el-descriptions-item__content,.el-descriptions-item__container .el-descriptions-item__label{
-  display:inline-flex;
-  align-items:baseline
+
+.el-descriptions-item__container .el-descriptions-item__content,
+.el-descriptions-item__container .el-descriptions-item__label {
+  display: inline-flex;
+  align-items: baseline
 }
-.el-descriptions-item__container .el-descriptions-item__content{
-  flex:1
+
+.el-descriptions-item__container .el-descriptions-item__content {
+  flex: 1
 }
-.el-descriptions-item__label.has-colon:after{
-  content:":";
-  position:relative;
-  top:-.5px
+
+.el-descriptions-item__label.has-colon:after {
+  content: ":";
+  position: relative;
+  top: -.5px
 }
-.el-descriptions-item__label.is-bordered-label{
-  font-weight:700;
-  color:#909399;
-  background:#fafafa
+
+.el-descriptions-item__label.is-bordered-label {
+  font-weight: 700;
+  color: #909399;
+  background: #fafafa
 }
-.el-descriptions-item__label:not(.is-bordered-label){
-  margin-right:10px
+
+.el-descriptions-item__label:not(.is-bordered-label) {
+  margin-right: 10px
 }
-.el-descriptions-item__content{
-  word-break:break-word;
-  overflow-wrap:break-word
+
+.el-descriptions-item__content {
+  word-break: break-word;
+  overflow-wrap: break-word
 }
+
+.feedBack-box {
+  .el-dialog__wrapper {
+    z-index: 3999 !important;
+  }
+}
+
+.feedBack-select-box {
+  z-index: 4000 !important;
+}
+
+.feedBack-box-modal {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  opacity: .5;
+  background: #000;
+  z-index: 3999;
+}
+.el-message-box__wrapper{
+  z-index: 9999 !important;
+}

src/utils/request.js

@@ -27,7 +27,7 @@ service.interceptors.request.use(
     }
     try {
       if (eval(process.env.VUE_APP_LOGIN_FOR_PERMISSION)) {
-        if (!path || path === '/ReviewersResearchForm' || path === '/ReviewersResearch' || path === '/login' || path === '/researchForm' || path === '/researchLogin' || path === '/email-recompose' || path === '/recompose' || path === '/resetpassword' || path === '/error') {
+        if (!path || path === '/ReviewersResearchForm' || path === '/ReviewersResearch' || path === '/login' || path === '/researchForm' || path === '/researchDetail_m' || path === '/researchLogin_m' || path === '/researchLogin' || path === '/email-recompose' || path === '/recompose' || path === '/resetpassword' || path === '/error') {
           return config
         }
         if (store.state.user.userId !== zzSessionStorage.getItem('userId')) {

src/utils/version-polling.esm.js

@@ -0,0 +1,222 @@
+/*!
+  * version-polling v1.2.6
+  * (c) 2023 JoeshuTT
+  * @license MIT
+  */
+function _defineProperty(obj, key, value) {
+  key = _toPropertyKey(key);
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value: value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+  return obj;
+}
+function _toPrimitive(input, hint) {
+  if (typeof input !== "object" || input === null) return input;
+  var prim = input[Symbol.toPrimitive];
+  if (prim !== undefined) {
+    var res = prim.call(input, hint || "default");
+    if (typeof res !== "object") return res;
+    throw new TypeError("@@toPrimitive must return a primitive value.");
+  }
+  return (hint === "string" ? String : Number)(input);
+}
+function _toPropertyKey(arg) {
+  var key = _toPrimitive(arg, "string");
+  return typeof key === "symbol" ? key : String(key);
+}
+
+/**
+ * 是否有值
+ * @param {*} val
+ */
+/**
+ * 创建一个 Web Work 实例
+ * @param func
+ */
+function createWorker(func) {
+  const blob = new Blob(["(" + func.toString() + ")()"]);
+  const url = window.URL.createObjectURL(blob);
+  const worker = new Worker(url);
+  window.URL.revokeObjectURL(url);
+  return worker;
+}
+function createWorkerFunc() {
+  let timerId = null;
+  let options;
+  self.onmessage = event => {
+    let code = event.data["code"];
+    options = Object.assign({}, options, event.data["data"]);
+    const {
+      htmlFileUrl,
+      lastEtag,
+      appETagKey,
+      pollingInterval,
+      silentPollingInterval
+    } = options;
+    const runReq = () => {
+      fetch(htmlFileUrl, {
+        method: "HEAD",
+        cache: "no-cache"
+      }).then(response => {
+        if (Number(response.status) !== 200) {
+          return;
+        }
+        const etag = response.headers.get("etag");
+        if (lastEtag !== etag) {
+          self.postMessage({
+            appETagKey,
+            lastEtag,
+            etag
+          });
+        }
+      });
+    };
+    const startPollingTask = () => {
+      timerId = setInterval(runReq, pollingInterval);
+    };
+    const pausePollingTask = () => {
+      if (timerId) {
+        clearInterval(timerId);
+        timerId = null;
+      }
+    };
+    if (code === "pause") {
+      pausePollingTask();
+    } else {
+      runReq(); // 立即执行一次
+      if (!silentPollingInterval) {
+        startPollingTask();
+      }
+    }
+  };
+  return self;
+}
+function closeWorker(worker) {
+  worker.terminate();
+}
+
+let APP_ETAG_KEY = "__APP_ETAG__";
+let myWorker;
+const defaultOptions = {
+  appETagKey: APP_ETAG_KEY,
+  pollingInterval: 5 * 60 * 1000,
+  htmlFileUrl: `${location.origin}${location.pathname}`,
+  silent: false,
+  silentPollingInterval: false,
+  silentPageVisibility: false,
+  forceUpdate: false
+};
+let attached = false;
+/**
+ * 页面隐藏时停止轮询任务，页面再度可见时在继续
+ */
+function handleVisibilityChange() {
+  if (document.visibilityState === "visible") {
+    myWorker.postMessage({
+      code: "resume"
+    });
+  } else {
+    myWorker.postMessage({
+      code: "pause"
+    });
+  }
+}
+class VersionPolling {
+  constructor(options) {
+    _defineProperty(this, "options", void 0);
+    _defineProperty(this, "appEtag", "");
+    this.options = Object.assign({}, defaultOptions, options);
+    this.init();
+  }
+  async init() {
+    const {
+      htmlFileUrl
+    } = this.options;
+    if (!htmlFileUrl) {
+      throw new Error("[version-polling]: htmlFileUrl is required");
+    }
+    const response = await fetch(htmlFileUrl, {
+      method: "HEAD",
+      cache: "no-cache"
+    });
+    if (Number(response.status) !== 200) {
+      throw new Error(`[version-polling]: status is ${response.status}`);
+    }
+    const etag = response.headers.get("etag");
+    // eslint-disable-next-line no-eq-null
+    if (etag == null) {
+      throw new Error(`[version-polling]: etag is null`);
+    }
+    this.appEtag = etag;
+    localStorage.setItem(`${this.options.appETagKey}`, etag);
+    this.start();
+  }
+  start() {
+    const {
+      appETagKey,
+      pollingInterval,
+      htmlFileUrl,
+      silent,
+      silentPollingInterval,
+      silentPageVisibility
+    } = this.options;
+    if (silent) {
+      return;
+    }
+    myWorker = createWorker(createWorkerFunc);
+    myWorker.postMessage({
+      code: "start",
+      data: {
+        appETagKey,
+        pollingInterval,
+        htmlFileUrl,
+        silentPollingInterval,
+        lastEtag: this.appEtag
+      }
+    });
+    myWorker.onmessage = event => {
+      const {
+        lastEtag,
+        etag
+      } = event.data;
+      if (lastEtag !== etag) {
+        this.stop();
+        this.options.onUpdate(this);
+      }
+    };
+    if (!silentPageVisibility) {
+      if (!attached) {
+        document.addEventListener("visibilitychange", handleVisibilityChange);
+        attached = true;
+      }
+    }
+  }
+  stop() {
+    if (myWorker) {
+      closeWorker(myWorker);
+      if (attached) {
+        document.removeEventListener("visibilitychange", handleVisibilityChange);
+        attached = false;
+      }
+    }
+  }
+  onRefresh() {
+    window.location.reload();
+  }
+  onCancel() {
+    this.options.forceUpdate && this.start();
+  }
+}
+function createVersionPolling(options) {
+  const versionPolling = new VersionPolling(options);
+  return versionPolling;
+}
+
+export { VersionPolling, createVersionPolling };

src/views/blindResumeInfo/components/StatusInfo.vue

@@ -2,7 +2,7 @@
   <div class="status-info">
     <el-form :inline="true" :model="basicInfo" class="demo-form-inline" size="small">
       <el-row>
-        <el-col :span="6">
+        <!-- <el-col :span="6">
           <el-form-item :label="$t('resumeInfo:label:Pending')">
             <span v-if="statusList.Submitted" style="color:#428bca">
               <router-link
@@ -42,7 +42,7 @@
             </span>
             <span v-else>{{ statusList.Reading }}</span>
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col :span="6">
           <el-form-item :label="$t('resumeInfo:label:Vacation')">
             <span style="font-size:12px;margin-right:20px;">{{ holiday }}</span>

src/views/blindResumeInfo/info.vue

@@ -1,14 +1,14 @@
 <template>
   <div v-loading="pageLoading" style="height:100%;display:flex;flex-direction: column;">
     <div style="height:50px">
-      <div style="text-align:right;">
+      <!-- <div style="text-align:right;">
         <el-switch
           v-model="isEnglish"
           active-text="EN"
           inactive-text="中文"
           style="margin-right:20px;"
         />
-      </div>
+      </div> -->
       <div style="text-align:center;">
         <h3>{{ title }}</h3>
       </div>

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

@@ -64,20 +64,22 @@
 import * as dicomParser from 'dicom-parser'
 import * as cornerstone from 'cornerstone-core'
 import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'
-import dicomStore from '@/utils/dicom-store'
+// import dicomStore from '@/utils/dicom-store'
 import dicomViewer from '@/components/Dicom/DicomViewer'
 import dicomPreview from '@/components/Dicom/DicomPreview'
-
+var config = {
+  maxWebWorkers: 4,
+  startWebWorkersOnDemand: true,
+  taskConfiguration: {
+    decodeTask: {
+      initializeCodecsOnStartup: false
+    }
+  }
+}
+cornerstoneWADOImageLoader.webWorkerManager.initialize(config)
 cornerstoneWADOImageLoader.external.dicomParser = dicomParser
 cornerstoneWADOImageLoader.external.cornerstone = cornerstone
-// cornerstoneWADOImageLoader.webWorkerManager.initialize({
-//   webWorkerPath: './webWorker.js',
-//   taskConfiguration: {
-//     decodeTask: {
-//       codecsPath: './dicomCodecs.js'
-//     }
-//   }
-// })
+
 export default {
   components: {
     dicomViewer,
@@ -90,6 +92,7 @@ export default {
     },
     studyList: {
       type: Array,
+      // eslint-disable-next-line vue/require-valid-default-prop
       default: []
     }
   },

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

@@ -138,11 +138,21 @@ import * as cornerstone from 'cornerstone-core'
 import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'
 import dicomViewer from '@/components/Dicom/DicomViewer'
 import { getStudyInfo, getSeriesList } from '@/api/reading'
-import { getInstanceList, setSeriesStatus } from '@/api/trials'
+import { getInstanceList, getPatientSeriesList, setSeriesStatus } from '@/api/trials'
 
 import requestPoolManager from '@/utils/request-pool'
 import store from '@/store'
 import { changeURLStatic } from '@/utils/history.js'
+var config = {
+  maxWebWorkers: 4,
+  startWebWorkersOnDemand: true,
+  taskConfiguration: {
+    decodeTask: {
+      initializeCodecsOnStartup: false
+    }
+  }
+}
+cornerstoneWADOImageLoader.webWorkerManager.initialize(config)
 cornerstoneWADOImageLoader.external.dicomParser = dicomParser
 cornerstoneWADOImageLoader.external.cornerstone = cornerstone
 const maximumSizeInBytes = 1024 * 1024 * 1024 * 6
@@ -209,6 +219,8 @@ export default {
       this.loadStudy()
     } else if (this.type === 'Share') {
       this.loadStudy()
+    } else if (this.type === 'Patient') {
+      this.loadPatientStudy()
     }
     cornerstone.events.addEventListener('cornerstoneimageloadprogress', this.cornerstoneimageloadprogress)
     window.addEventListener('beforeunload', e => {
@@ -227,14 +239,75 @@ export default {
     async loadStudy() {
       const data = await getStudyInfo(this.studyId)
       if (data.IsSuccess) {
-        this.studyCode = data.Result.StudyCode
-        this.modality = data.Result.Modalities
-        this.seriesCount = data.Result.SeriesCount
-        this.description = data.Result.Description
+        if (data.Result) {
+          this.studyCode = data.Result.StudyCode
+          this.modality = data.Result.Modalities
+          this.seriesCount = data.Result.SeriesCount
+          this.description = data.Result.Description
+        }
         const url = `/series/list/${this.studyId}`
         this.getSeriesList(url)
       }
     },
+    async loadPatientStudy() {
+      try {
+        let data = await getPatientSeriesList(this.studyId);
+        if (data.IsSuccess) {
+          const { Result } = data
+          var seriesList = []
+          Result.forEach((item, index) => {
+            const imageIds = []
+            item.InstanceInfoList.forEach(i => {
+              if (i.NumberOfFrames && i.NumberOfFrames > 1) {
+                for (let j = 0; j < i.NumberOfFrames; j++) {
+                  imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${i.Path}?frame=${j}&instanceId=${i.Id}&seriesIndex=${index}`)
+                }
+                i.ImageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${i.Path}?frame=0&instanceId=${i.Id}&seriesIndex=${index}`
+              } else {
+                const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${i.Path}?instanceId=${i.Id}&seriesIndex=${index}`
+                imageIds.push(imageId)
+                i.ImageId = imageId
+              }
+            })
+            var subjectVisitId = this.$router.currentRoute.query.subjectVisitId
+            var studyId = this.$router.currentRoute.query.studyId
+            var trialId = this.$router.currentRoute.query.trialId
+            seriesList.push({
+              trialId,
+              subjectVisitId,
+              studyId,
+              imageIds: imageIds,
+              instanceInfoList: item.InstanceInfoList,
+              seriesId: item.Id,
+              seriesUid: item.SeriesInstanceUid,
+              seriesNumber: item.SeriesNumber,
+              sliceThickness: item.SliceThickness,
+              modality: item.Modality,
+              description: item.Description,
+              isReading: item.IsReading,
+              isDeleted: item.IsDeleted,
+              previewImageUrl: item.ImageResizePath ? this.OSSclientConfig.basePath + item.ImageResizePath : `/api/series/preview/${item.Id}`,
+              instanceCount: item.InstanceCount,
+              prefetchInstanceCount: 0,
+              hasLabel: item.HasLabel,
+              keySeries: item.KeySeries,
+              tpCode: this.tpCode,
+              loadStatus: false,
+              imageloadedArr: [],
+              isExistMutiFrames: item.IsExistMutiFrames
+            })
+          })
+          this.seriesList = seriesList
+          if (this.seriesList.length > 0) {
+            this.loadAllImages()
+            this.$refs.dicomViewer.loadImageStack(this.seriesList[0], this.labels[this.tpCode])
+            this.firstInstanceId = this.seriesList[0].imageIds[0]
+          }
+        }
+      } catch (err) {
+        console.log(err)
+      }
+    },
     async getSeriesList(url) {
       try {
         const data = await getSeriesList(url)

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

@@ -265,6 +265,16 @@ import requestPoolManager from '@/utils/request-pool'
 import store from '@/store'
 import { changeURLStatic } from '@/utils/history.js'
 // import * as cornerstoneTools from 'cornerstone-tools'
+var config = {
+  maxWebWorkers: 4,
+  startWebWorkersOnDemand: true,
+  taskConfiguration: {
+    decodeTask: {
+      initializeCodecsOnStartup: false
+    }
+  }
+}
+cornerstoneWADOImageLoader.webWorkerManager.initialize(config)
 cornerstoneWADOImageLoader.external.dicomParser = dicomParser
 cornerstoneWADOImageLoader.external.cornerstone = cornerstone
 const maximumSizeInBytes = 1024 * 1024 * 1024 * 6

src/views/dictionary/institutions/components/SiteForm.vue

@@ -18,7 +18,7 @@
         <el-input v-model="form.SiteName" />
       </el-form-item>
       <!-- 中心名称（CN） -->
-      <el-form-item :label="$t('trials:customSite:form:siteName') + '（CN）'" v-if="!show" prop="SiteNameCN">
+      <el-form-item :label="$t('trials:customSite:form:siteName') + '（CN）'"  prop="SiteNameCN">
         <el-input v-model="form.SiteNameCN" />
       </el-form-item>
 

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

@@ -59,7 +59,7 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span="12" v-if="IsSystemLevel < 2">
+      <el-col :span="12" v-if="systemLevel !== 1">
         <el-form-item label="收件人" prop="ToUserTypeList">
           <el-select
             v-model="form.ToUserTypeList"
@@ -76,7 +76,7 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span="12" v-if="!IsSystemLevel">
+      <el-col :span="12" v-if="!systemLevel">
         <el-form-item label="抄送人" prop="CopyUserTypeList">
           <el-select
             v-model="form.CopyUserTypeList"
@@ -93,7 +93,7 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span="12" v-if="!IsSystemLevel">
+      <el-col :span="12" v-if="!systemLevel">
         <el-form-item label="加急状态" prop="EmailUrgentEnum">
           <el-select
             v-model="form.EmailUrgentEnum"
@@ -114,7 +114,7 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span="12" v-if="!IsSystemLevel">
+      <el-col :span="12" v-if="!systemLevel">
         <el-form-item
           label="发送周期和时间"
           v-if="form.EmailUrgentEnum !== 1"
@@ -124,7 +124,7 @@
           <el-button type="primary" @click="showDialog">生成 cron</el-button>
         </el-form-item>
       </el-col>
-      <el-col :span="12" v-if="!IsSystemLevel">
+      <el-col :span="12" v-if="!systemLevel">
         <el-form-item label="是否需要回执" prop="IsReturnRequired">
           <el-radio-group v-model="form.IsReturnRequired">
             <el-radio :label="true">是</el-radio>
@@ -132,7 +132,7 @@
           </el-radio-group>
         </el-form-item>
       </el-col>
-      <el-col :span="12" v-if="!IsSystemLevel">
+      <el-col :span="12" v-if="!systemLevel">
         <el-form-item label="是否自动发送" prop="IsAutoSend">
           <el-radio-group v-model="form.IsAutoSend">
             <el-radio :label="true">是</el-radio>
@@ -140,7 +140,7 @@
           </el-radio-group>
         </el-form-item>
       </el-col>
-      <el-col :span="12" v-if="!IsSystemLevel">
+      <el-col :span="12" v-if="!systemLevel">
         <el-form-item label="是否区分标准" prop="IsDistinguishCriteria">
           <el-radio-group
             v-model="form.IsDistinguishCriteria"
@@ -155,7 +155,7 @@
           </el-radio-group>
         </el-form-item>
       </el-col>
-      <el-col :span="12" v-if="!IsSystemLevel">
+      <el-col :span="12" v-if="!systemLevel">
         <el-form-item
           :label="$t('trials:auditRecord:table:criterion')"
           v-if="form.IsDistinguishCriteria"
@@ -171,7 +171,7 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span="12" v-if="!IsSystemLevel">
+      <el-col :span="12" v-if="!systemLevel">
         <el-form-item label="是否启用" prop="IsEnable">
           <el-radio-group v-model="form.IsEnable">
             <el-radio :label="true">是</el-radio>
@@ -179,7 +179,7 @@
           </el-radio-group>
         </el-form-item>
       </el-col>
-      <el-col :span="12" v-if="!IsSystemLevel">
+      <el-col :span="12" v-if="!systemLevel">
         <el-form-item label="附件（CN）" prop="IsEnable">
           <el-upload
             class="upload-demo"
@@ -201,7 +201,7 @@
           </el-upload>
         </el-form-item>
       </el-col>
-      <el-col :span="12" v-if="!IsSystemLevel">
+      <el-col :span="12" v-if="!systemLevel">
         <el-form-item label="附件（EN）" prop="IsEnable">
           <el-upload
             class="upload-demo"
@@ -268,7 +268,7 @@ export default {
         return {};
       },
     },
-    IsSystemLevel: {
+    systemLevel: {
       type: Number,
       default() {
         return 0;
@@ -345,8 +345,10 @@ export default {
   },
   mounted() {
     this.initForm();
-    if (this.IsSystemLevel) {
-      this.form.ToUserTypeList = [];
+    if (this.systemLevel) {
+      if (this.systemLevel === 1) {
+        this.form.ToUserTypeList = [];
+      }
       this.form.CopyUserTypeList = [];
       this.form.EmailUrgentEnum = "3";
       this.form.IsReturnRequired = false;
@@ -457,7 +459,7 @@ export default {
       this.$refs.emailForm.validate((valid) => {
         if (!valid) return;
         this.loading = true;
-        this.form.IsSystemLevel = this.IsSystemLevel;
+        this.form.systemLevel = this.systemLevel;
         addOrUpdateEmailNoticeConfigList(this.form)
           .then((res) => {
             this.loading = false;

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

@@ -2,7 +2,7 @@
   <box-content>
     <div class="search">
       <el-form
-        v-if="!IsSystemLevel"
+        v-if="!systemLevel"
         :inline="true"
         size="mini"
         class="base-search-form"
@@ -167,7 +167,7 @@
         :label="$t('trials:emailManageCfg:title:toUserTypeList')"
         show-overflow-tooltip
         min-width="100"
-        v-if="IsSystemLevel < 2"
+        v-if="systemLevel !== 1"
       >
         <template slot-scope="scope">
           {{
@@ -185,7 +185,7 @@
         :label="$t('trials:emailManageCfg:title:copyUserTypeList')"
         show-overflow-tooltip
         min-width="100"
-        v-if="!IsSystemLevel"
+        v-if="!systemLevel"
       >
         <template slot-scope="scope">
           {{
@@ -203,7 +203,7 @@
         sortable="custom"
         show-overflow-tooltip
         min-width="100"
-        v-if="!IsSystemLevel"
+        v-if="!systemLevel"
       >
         <template slot-scope="scope">
           {{ $fd("EmailUrgent", scope.row.EmailUrgentEnum) }}
@@ -215,7 +215,7 @@
         sortable="custom"
         show-overflow-tooltip
         min-width="160"
-        v-if="!IsSystemLevel"
+        v-if="!systemLevel"
       />
       <!-- 附件 -->
       <el-table-column
@@ -223,7 +223,7 @@
         :label="$t('trials:emailManageCfg:title:fileName')"
         show-overflow-tooltip
         min-width="100"
-        v-if="!IsSystemLevel"
+        v-if="!systemLevel"
       >
         <template slot-scope="scope">
           <el-button
@@ -242,7 +242,7 @@
         show-overflow-tooltip
         sortable="custom"
         min-width="140"
-        v-if="!IsSystemLevel"
+        v-if="!systemLevel"
       >
         <template slot-scope="scope">
           <el-tag v-if="scope.row.IsReturnRequired" type="danger">
@@ -260,7 +260,7 @@
         show-overflow-tooltip
         sortable="custom"
         min-width="160"
-        v-if="!IsSystemLevel"
+        v-if="!systemLevel"
       >
         <template slot-scope="scope">
           <el-tag v-if="scope.row.IsAutoSend" type="danger">
@@ -277,7 +277,7 @@
         show-overflow-tooltip
         sortable="custom"
         min-width="160"
-        v-if="!IsSystemLevel"
+        v-if="!systemLevel"
       >
         <template slot-scope="scope">
           <el-tag v-if="scope.row.IsEnable" type="danger">
@@ -337,7 +337,7 @@
     >
       <EmailForm
         :data="rowData"
-        :is-system-level="IsSystemLevel"
+        :system-level="systemLevel"
         @closeDialog="closeDialog"
         @getList="getList"
       />
@@ -390,7 +390,7 @@ export default {
         return false;
       },
     },
-    IsSystemLevel: {
+    systemLevel: {
       type: Number,
       default() {
         return 0;
@@ -418,7 +418,7 @@ export default {
     getList() {
       this.loading = true;
       this.searchData.IsDistinguishCriteria = this.isDistinguishCriteria;
-      this.searchData.IsSystemLevel = this.IsSystemLevel;
+      this.searchData.systemLevel = this.systemLevel;
       getEmailNoticeConfigList(this.searchData)
         .then((res) => {
           this.loading = false;

src/views/dictionary/template/email/index.vue

@@ -6,7 +6,7 @@
         <EmailList
           v-if="activeTab === '0'"
           :is-distinguish-criteria="false"
-          :is-system-level="0"
+          :system-level="0"
         ></EmailList>
       </el-tab-pane>
       <!-- 标准相关 -->
@@ -17,7 +17,7 @@
         <EmailList
           v-if="activeTab === '1'"
           :is-distinguish-criteria="true"
-          :is-system-level="0"
+          :system-level="0"
         ></EmailList>
       </el-tab-pane>
       <!-- 系统相关 -->
@@ -25,7 +25,7 @@
         <EmailList
           v-if="activeTab === '2'"
           :is-distinguish-criteria="false"
-          :is-system-level="1"
+          :system-level="1"
         ></EmailList>
       </el-tab-pane>
       <!-- 系统相关-分角色 -->
@@ -33,7 +33,7 @@
         <EmailList
           v-if="activeTab === '3'"
           :is-distinguish-criteria="false"
-          :is-system-level="2"
+          :system-level="2"
         ></EmailList>
       </el-tab-pane>
     </el-tabs>

src/views/feedBack/index.vue

@@ -35,6 +35,7 @@
             v-model="searchData.UserTypeEnum"
             clearable
             style="width: 150px"
+            popper-class="feedBack-select-box"
           >
             <el-option
               v-for="item of UserTypeOptins"
@@ -47,7 +48,7 @@
         <!--反馈人-->
         <el-form-item :label="$t('feedBack:search:user')" v-if="level > 7">
           <el-input
-            v-model="searchData.FeedBackKeyInfo"
+            v-model="searchData.FeedBackUserKeyInfo"
             clearable
             style="width: 150px"
           ></el-input>
@@ -58,6 +59,7 @@
             v-model="searchData.QuestionType"
             clearable
             style="width: 150px"
+            popper-class="feedBack-select-box"
           >
             <el-option
               v-for="item of QuestionTypeOptions"
@@ -77,7 +79,12 @@
         </el-form-item>
         <!--状态-->
         <el-form-item :label="$t('feedBack:search:status')" v-if="level > 7">
-          <el-select v-model="searchData.State" clearable style="width: 150px">
+          <el-select
+            v-model="searchData.State"
+            clearable
+            style="width: 150px"
+            popper-class="feedBack-select-box"
+          >
             <el-option
               v-for="item of $d.FeedBackStatus"
               :key="item.value"
@@ -97,6 +104,7 @@
             value-format="yyyy-MM-dd HH:mm:ss"
             @change="handleDatetimeChange"
             style="width: 250px"
+            popper-class="feedBack-select-box"
           />
         </el-form-item>
         <el-form-item>
@@ -116,14 +124,14 @@
           >
             {{ $t("common:button:reset") }}
           </el-button>
-          <el-button
+          <!-- <el-button
             type="primary"
             size="mini"
             @click="report"
             v-if="level > 7"
           >
             {{ $t("common:button:export") }}
-          </el-button>
+          </el-button> -->
         </el-form-item>
         <el-button
           type="primary"
@@ -157,15 +165,15 @@
         <el-table-column
           :label="$t('feedBack:form:trialCode')"
           prop="TrialCode"
-          min-width="80"
+          min-width="100"
           show-overflow-tooltip
           sortable="custom"
           v-if="level > 8"
         />
         <el-table-column
           :label="$t('feedBack:form:study')"
-          prop="NoticeTypeEnum"
-          min-width="100"
+          prop="ExperimentName"
+          min-width="140"
           show-overflow-tooltip
           sortable="custom"
           v-if="level > 8"
@@ -178,6 +186,14 @@
           sortable="custom"
           v-if="level > 7"
         />
+        <el-table-column
+          :label="$t('feedBack:form:SubjectCode')"
+          prop="SubjectCode"
+          min-width="120"
+          show-overflow-tooltip
+          sortable="custom"
+          v-if="level > 7"
+        />
         <el-table-column
           :label="$t('feedBack:form:subjectVisit')"
           prop="SubjectVisitName"
@@ -197,7 +213,7 @@
         <el-table-column
           :label="$t('feedBack:form:user')"
           prop="FeedBackFullName"
-          min-width="80"
+          min-width="140"
           show-overflow-tooltip
           sortable="custom"
           v-if="level > 7"
@@ -205,7 +221,7 @@
         <el-table-column
           :label="$t('feedBack:form:questionType')"
           prop="QuestionType"
-          min-width="120"
+          min-width="180"
           show-overflow-tooltip
           sortable="custom"
         >
@@ -220,21 +236,21 @@
         <el-table-column
           :label="$t('feedBack:form:description')"
           prop="QuestionDescription"
-          min-width="100"
+          min-width="200"
           show-overflow-tooltip
           sortable="custom"
         />
         <el-table-column
           :label="$t('feedBack:form:time')"
           prop="CreateTime"
-          min-width="100"
+          min-width="180"
           show-overflow-tooltip
           sortable="custom"
         />
         <el-table-column
           :label="$t('feedBack:form:status')"
           prop="State"
-          min-width="80"
+          min-width="120"
           show-overflow-tooltip
           sortable="custom"
           v-if="level > 7"
@@ -248,7 +264,7 @@
         <el-table-column
           :label="$t('feedBack:form:uploadTime')"
           prop="UpdateTime"
-          min-width="100"
+          min-width="180"
           show-overflow-tooltip
           sortable="custom"
           v-if="level > 7"
@@ -286,7 +302,7 @@ const searchDataDefault = () => {
     TrialKeyInfo: null,
     SubejctAndVisitKeyInfo: null,
     UserTypeEnum: null,
-    FeedBackKeyInfo: null,
+    FeedBackUserKeyInfo: null,
     QuestionDescription: null,
     QuestionType: null,
     State: null,
@@ -303,7 +319,7 @@ export default {
   components: { Pagination },
   props: {
     trialId: {
-      required: true,
+      type: String,
       default: "",
     },
   },
@@ -445,6 +461,7 @@ export default {
         Id: row.Id,
         callBack: () => {
           this.getList();
+          this.$emit("success");
         },
       });
     },

src/views/login/index.vue

@@ -18,15 +18,11 @@
         <div
           :class="{
             'login-image': true,
-            'login-image-usa': NODE_ENV === 'usa',
+            'login-image-usa': true,
           }"
         >
-          <svg-icon
-            icon-class="login-bg"
-            style="width: 90%; height: 90%"
-            v-if="NODE_ENV === 'usa'"
-          />
-          <img src="@/assets/login-bg.png" v-else />
+          <svg-icon icon-class="login-bg" style="width: 90%; height: 90%" />
+          <!-- <img src="@/assets/login-bg.png" v-else /> -->
         </div>
       </div>
       <div class="login-r">
@@ -119,7 +115,12 @@
             {{ $t("login:button:login") }}
           </el-button>
           <div style="text-align: right">
-            <TopLang v-if="VUE_APP_OSS_CONFIG_REGION !== 'oss-us-west-1'&& NODE_ENV !== 'usa'" />
+            <TopLang
+              v-if="
+                VUE_APP_OSS_CONFIG_REGION !== 'oss-us-west-1' &&
+                NODE_ENV !== 'usa'
+              "
+            />
             <!-- Forget password? -->
             <el-button
               type="text"
@@ -261,6 +262,17 @@ export default {
   computed: {
     ...mapGetters(["asyncRoutes", "routes", "language"]),
   },
+  watch: {
+    "$i18n.locale": {
+      handler() {
+        if (this.$refs.browserTip) {
+          this.$refs.browserTip.open();
+        }
+      },
+      deep: true,
+      immediate: true,
+    },
+  },
   mounted() {
     this.loginType = this.$route.query.loginType;
     this.location = this.$route.query.location;

src/views/research/components/ResearchForm.vue

@@ -6,7 +6,7 @@
         {{ $t('trials:researchForm:title:question') }}
       </h2>
       <div style="display: flex;justify-content: space-between;">
-        <div>调研表状态：<el-tag>{{ $fd('ResearchRecord', state) }}</el-tag></div>
+        <div>{{ $t('trials:researchForm:title:state') }}<el-tag>{{ $fd('ResearchRecord', state) }}</el-tag></div>
 
       </div>
     </div>
@@ -26,7 +26,7 @@
         <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">
         <h4>{{ $t('trials:equiptResearch:title:equiptResearch') }}</h4>
@@ -35,9 +35,12 @@
 
       <!-- 其他信息调研 -->
       <el-card shadow="hover" class="mt10">
-        <!-- 注意事项 -->
         <h4>{{ $t('trials:equiptResearch:form:precautions') }}</h4>
-        <ol>
+        <ol v-if="siteSurveyNoteInfo">
+          <div v-if="$i18n.locale === 'zh'" v-html="siteSurveyNoteInfo.ReplaceContentCN" />
+          <div v-else v-html="siteSurveyNoteInfo.ReplaceContent" />
+        </ol>
+        <ol v-else>
           <!-- 只要有可能，请确保受试者使用上述指定的扫描仪器采集影像。 -->
           <li>{{ $t('trials:equiptResearch:form:item1') }}</li>
           <!-- 请确保对每位受试者的扫描参数在整个研究过程中保持一致。 -->
@@ -148,7 +151,8 @@ export default {
       rejectForm: { reason: '' },
       btnLoading: false,
       isFullscreen: false,
-      historyVisible: false
+      historyVisible: false,
+      siteSurveyNoteInfo: null
     }
   },
   mounted() {
@@ -165,6 +169,9 @@ export default {
         if (res.Result) {
           // this.trialSiteSurveyEquipmentType = res.Result.TrialInfo.TrialSiteSurveyEquipmentType
           // this.trialSiteSurveyUserRoles = res.Result.TrialInfo.TrialSiteSurveyUserRoles
+          if (res.Result.SiteSurveyFiledConfig && res.Result.SiteSurveyFiledConfig.ModifyFiledList.length > 0) {
+            this.siteSurveyNoteInfo = res.Result.SiteSurveyFiledConfig.ModifyFiledList.find(i => i.NeedModifyFiled === 'SiteSurveyNote')
+          }
           var historicalArr = []
           var newArr = []
           res.Result.TrialSiteUserSurveyList.map(i => {
@@ -176,11 +183,11 @@ export default {
           })
           this.state = res.Result.TrialSiteSurvey.State
           this.siteId = res.Result.TrialSiteSurvey.TrialSiteId
-          this.$refs['baseResearchInfo'].initForm(res.Result.TrialInfo, res.Result.TrialSiteSurvey)
+          this.$refs['baseResearchInfo'].initForm(res.Result.TrialInfo, res.Result.TrialSiteSurvey, res.Result.SiteSurveyFiledConfig ? res.Result.SiteSurveyFiledConfig.NotShowFieldList : null)
           this.$refs['historicalParticipant'].initList(historicalArr, res.Result.TrialSiteSurvey)
           this.$refs['researchParticipants'].initList(newArr, res.Result.TrialSiteSurvey)
           // this.$refs['researchParticipants'].initList(res.Result.TrialSiteUserSurveyList, res.Result.TrialSiteSurvey)
-          this.$refs['researchEquipments'].initList(res.Result.TrialSiteEquipmentSurveyList, res.Result.TrialSiteSurvey)
+          this.$refs['researchEquipments'].initList(res.Result.TrialSiteEquipmentSurveyList, res.Result.TrialSiteSurvey, !(res.Result.SiteSurveyFiledConfig && res.Result.SiteSurveyFiledConfig.ModifyFiledList.length > 0))
           this.isExistIncorrect = res.Result.TrialSiteUserSurveyList.every(item => item.IsCorrect === false)
         }
         this.loading = false

src/views/resumeInfo/components/StatusInfo.vue

@@ -2,7 +2,7 @@
   <div class="status-info">
     <el-form :inline="true" :model="basicInfo" class="demo-form-inline" size="small">
       <el-row>
-        <el-col :span="6">
+        <!-- <el-col :span="6">
           <el-form-item :label="$t('resumeInfo:label:Pending')">
             <span v-if="statusList.Submitted" style="color:#428bca">
               <router-link
@@ -42,7 +42,7 @@
             </span>
             <span v-else>{{ statusList.Reading }}</span>
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col :span="6">
           <el-form-item :label="$t('resumeInfo:label:Vacation')">
             <span style="font-size:12px;margin-right:20px;">{{ holiday }}</span>

src/views/reviewers/components/Agreements.vue

@@ -5,7 +5,7 @@
       <div class="upload-content">
         <upload-files ref="uploadAgreement" :disabled="$route.query.ReviewStatus === '1'" :doctor-id="doctorId" type="Consultant Agreement" accept=".pdf" @getFileList="getFileList" />
       </div>
-      <p>{{ $t('system:Agreements:tap:must') }}</p>
+      <p>{{ $t('system:tip:file:pdf') }}</p>
     </div>
     <div v-if="!$route.query.ReviewStatus">
       <el-table :data="agreementList" size="small">

src/views/reviewers/components/GcpCertificate.vue

@@ -20,7 +20,7 @@
         accept=".pdf"
       >
         <el-button size="small" type="primary" :loading="btnDisabled">{{ $t('system:GcpCertificate:upload:Upload') }}</el-button>
-        <span slot="tip" style="margin-left:10px;" class="el-upload__tip">{{ $t('system:GcpCertificate:tap:must') }}</span>
+        <span slot="tip" style="margin-left:10px;" class="el-upload__tip">{{ $t('system:tip:file:pdf') }}</span>
       </el-upload>
     </div>
     <div>
@@ -76,7 +76,7 @@ export default {
   methods: {
     handleSaveGCP() {
       if (this.GCP && this.GCPID === '') {
-        this.$message.info('Please upload the GCP certificate')
+        this.$message.info(this.$t('reviewers:GCPCertificate:message:uploadValid'))
         return
       }
 
@@ -91,7 +91,7 @@ export default {
           this.fileList = []
         }
         this.saveBtnLoading = false
-        this.$message.success('Saved successfully')
+        this.$message.success(this.$t('common:message:savedSuccessfully'))
       }).catch(() => {
         this.saveBtnLoading = false
       })
@@ -153,7 +153,7 @@ export default {
         if (res.IsSuccess) {
           this.fileList[0].id = res.Result[0].Id
           this.GCPID = res.Result[0].Id
-          this.$message.success('Uploaded successfully')
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
         }
       })
         .catch(() => {
@@ -165,7 +165,7 @@ export default {
       if (isValidFile) {
         this.fileList = []
       } else {
-        this.$alert('must be in pdf format')
+        this.$alert(this.$t('trials:attachment:message:pdf'))
         return false
       }
     },

src/views/reviewers/components/Resumes.vue

@@ -19,7 +19,7 @@
         </div>
       </div>
 
-      <p>{{ $t('system:GcpCertificate:tap:must') }}</p>
+      <p>{{ $t('system:tip:file:docx') }}</p>
     </div>
     <div class="resumeTbl">
       <el-table :data="resumeListEN" size="small">
@@ -78,7 +78,7 @@
           </el-upload>
         </div>
       </div>
-      <p>{{ $t('system:GcpCertificate:tap:must') }}</p>
+      <p>{{ $t('system:tip:file:docx') }}</p>
     </div>
     <div class="resumeTbl">
       <el-table :data="resumeListCN" size="small">

src/views/system/login-log/index.vue

@@ -38,6 +38,34 @@
             style="width: 120px"
           />
         </el-form-item>
+        <el-form-item
+          :label="$t('system:loginLog:table:LoginUserName')"
+          prop="LoginFaildName"
+        >
+          <el-input
+            v-model="searchData.LoginUserName"
+            size="small"
+            clearable
+            style="width: 120px"
+          />
+        </el-form-item>
+        <el-form-item
+          :label=" $t('system:loginLog:table:LoginUserType')"
+          prop="LoginUserTypeEnum"
+        >
+          <el-select
+            v-model="searchData.LoginUserTypeEnum"
+            clearable
+            style="width: 120px"
+          >
+            <el-option
+              v-for="item of $d.UserType"
+              :key="'UserType' + item.label"
+              :value="item.value"
+              :label="item.label"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item :label="$t('system:loginLog:label:CreateTime')">
           <el-date-picker
             v-model="datetimerange"
@@ -45,17 +73,24 @@
             value-format="yyyy-MM-dd HH:mm:ss"
             :default-time="['00:00:00', '23:59:59']"
             @change="handleDatetimeChange"
+            style="width: 380px"
           />
         </el-form-item>
         <el-form-item>
           <el-button
             type="primary"
             icon="el-icon-search"
-            size="mini"
             @click="getList"
           >
             {{ $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-form>
       <el-table
@@ -163,6 +198,8 @@ const searchDataDefault = () => {
     OptType: null,
     Ip: "",
     LoginFaildName: "",
+    LoginUserName: '',
+    LoginUserTypeEnum: null,
     BeginDate: "",
     EndDate: "",
     Asc: false,
@@ -210,6 +247,7 @@ export default {
     },
     // 重置列表查询
     handleReset() {
+      this.datetimerange = []
       this.searchData = searchDataDefault();
       this.getList();
     },

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

@@ -25,12 +25,12 @@
       <el-form-item :label="$t('system:userlist:table:FirstName')" prop="FirstName">
         <el-input v-model="user.FirstName" />
       </el-form-item>
-      <el-form-item :label="$t('system:userlist:table:Gender')" prop="Sex" style="margin-right:40px;">
+      <!-- <el-form-item :label="$t('system:userlist:table:Gender')" prop="Sex" style="margin-right:40px;">
         <el-radio-group v-model="user.Sex">
           <el-radio :label="1">Male</el-radio>
           <el-radio :label="0">Female</el-radio>
         </el-radio-group>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item :label="$t('system:userlist:table:Email')" prop="EMail">
         <el-input v-model="user.EMail" />
       </el-form-item>

src/views/system/user/list/index.vue

@@ -100,15 +100,15 @@ export default {
           sortable: 'custom',
           showOverflowTooltip: true
         },
-        {
-          prop: 'Sex',
-          label: this.$t('system:userlist:table:Gender'),
-          hidden: true,
-          slot: 'genderSlot',
-          minWidth: 100,
-          sortable: 'custom',
-          showOverflowTooltip: true
-        },
+        // {
+        //   prop: 'Sex',
+        //   label: this.$t('system:userlist:table:Gender'),
+        //   hidden: true,
+        //   slot: 'genderSlot',
+        //   minWidth: 100,
+        //   sortable: 'custom',
+        //   showOverflowTooltip: true
+        // },
         {
           prop: 'Phone',
           label: this.$t('system:userlist:table:Phone'),

src/views/test/videos/index.vue

@@ -1,139 +0,0 @@
-<template>
-  <div>
-    <el-button plain @click="open">上传视频文件</el-button>
-    <el-button plain @click="$refs.file.click()">选择dicom文件</el-button>
-    <input
-      ref="file"
-      type="file"
-      name="file"
-      webkitdirectory
-      multiple
-      @change="beginScanFiles($event)"
-    />
-    <div>
-      <canvas id="img"></canvas>
-    </div>
-    <el-dialog title="上传视频" :close-on-click-modal="false" :visible.sync="IsOpen" width="450px" append-to-body>
-      <my-videos @uploadOver="uploadOver" />
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import MyVideos from '@/components/videos'
-import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'
-// import charLS from '@cornerstonejs/codec-charls';
-import * as cornerstone from 'cornerstone-core'
-import dicomParser from "dicom-parser";
-import { Anonymizer } from "dicomedit";
-console.log(Anonymizer)
-const script = `version "6.3"
-temp := "chany"
-(0008,0008) := "test"
-(0010,0010) := temp
-`;
-
-const CharLs = require('@cornerstonejs/codec-charls')
-const codecWrapper = {
-  codec: undefined,
-  Decoder: undefined,
-  Encoder: undefined,
-  encoderName: "JpegLSEncoder",
-  decoderName: "JpegLSDecoder",
-};
-function setCodec(codecConfig, encoderName, decoderName, codec = {}) {
-  codecConfig.Encoder = codec[encoderName];
-  codecConfig.Decoder = codec[decoderName];
-  codecConfig.codec = codec;
-}
-CharLs().then(res => {
-  setCodec(codecWrapper, codecWrapper.encoderName, codecWrapper.decoderName, res);
-})
-export default {
-  components: { MyVideos },
-  data() {
-    return {
-      IsOpen: false,
-      videoUrl: null,
-      videoName: null
-    }
-  },
-  methods: {
-    async upload(name, file) {
-      let res = await this.OSSclient.put(name, file)
-      return res
-    },
-    beginScanFiles(e) {
-      var files = e.target.files
-      console.log(e.target.files)
-      if (files.length > 0) {
-        files.forEach(async (item, index) => {
-          const reader = new FileReader();
-          reader.onload = async (event) => {
-            let buffer = event.target.result;
-            const anonymizer = new Anonymizer(script, { test: 'hello' });
-            anonymizer.loadDcm(new Uint8Array(buffer))
-            await anonymizer.applyRules();
-            let buffer1 = anonymizer.write()
-            let data1 = dicomParser.parseDicom(new Uint8Array(buffer1))
-            let data = dicomParser.parseDicom(new Uint8Array(buffer))
-            // 传输语法 0002 0010
-            // if(1.2.840.10008.1.2.1) 才压缩 => 1.2.840.10008.1.2.4.80
-            let height = data.uint16('x00280011')
-            let width = data.uint16('x00280010')
-            let bitsPerSample = data.uint16('x00280100')
-            let componentCount = data.string('x00280004')
-            let transportSyntax = data.string('x00020010')
-            // let pixel = data.byteArrayParser.readUint16('x7fe0x0010')
-            let pixelDataElement = data.elements.x7fe00010;
-            let pixelDataOffset = pixelDataElement.dataOffset;
-            let pixelDataLength = pixelDataElement.length;
-            let pixelDataBytes = data.byteArray.subarray(pixelDataOffset, pixelDataOffset + pixelDataLength)
-            if (transportSyntax === '1.2.840.10008.1.2.1' && ~componentCount.indexOf('MONOCHROME')) {
-              let encoder = new codecWrapper.Encoder();
-              let decodedBytes = encoder.getDecodedBuffer({width: width, height: height, bitsPerSample: bitsPerSample, componentCount: 1})
-              encoder.setNearLossless(0);
-              // 像素数据 7fe0 0010
-              decodedBytes.set(pixelDataBytes);
-              let startTime = performance.now()
-              encoder.encode()
-              let endTime = performance.now();
-              // dicom替换压缩像素 组装
-              let encodeDurationInSeconds = endTime - startTime
-              let encodedBytes = encoder.getEncodedBuffer();
-              data.elements['x00020010'].value = '1.2.840.10008.1.2.4.80'
-              console.log(data.elements['x7fe00010'].length)
-              data.elements['x7fe00010'].length = encodedBytes.length
-              console.log(data.elements['x7fe00010'].length)
-              let mateDataBytes = data.byteArray.subarray(0, pixelDataOffset)
-              let modifiedByteArray = new Uint8Array([...mateDataBytes, ...encodedBytes])
-              let newData = new dicomParser.ByteStream(data.byteArrayParser, modifiedByteArray, 0)
-              console.log(data)
-              console.log(newData)
-              console.log(dicomParser.parseDicom(new Uint8Array(newData.byteArray)))
-              await this.upload(`test/${index}`, newData)
-              encoder.delete();
-              return
-            }
-          };
-          reader.readAsArrayBuffer(item);
-        })
-      }
-    },
-    open() {
-      this.IsOpen = true
-    },
-    uploadOver(isSuccess, res) {
-      if (isSuccess) {
-        this.IsOpen = false
-        this.videoUrl = res.url
-        this.videoName = res.name
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>

src/views/test/videos/index2.vue

@@ -1,98 +0,0 @@
-<template>
-  <div>
-    <el-button plain @click="$refs.file.click()">选择dicom文件</el-button>
-    <input
-      ref="file"
-      type="file"
-      name="file"
-      webkitdirectory
-      multiple
-      @change="beginScanFiles($event)"
-    />
-  </div>
-</template>
-
-<script>
-import dicomParser from "dicom-parser";
-import dcmjs from 'dcmjs'
-const CharLs = require('@cornerstonejs/codec-charls')
-const codecWrapper = {
-  codec: undefined,
-  Decoder: undefined,
-  Encoder: undefined,
-  encoderName: "JpegLSEncoder",
-  decoderName: "JpegLSDecoder",
-};
-function setCodec(codecConfig, encoderName, decoderName, codec = {}) {
-  codecConfig.Encoder = codec[encoderName];
-  codecConfig.Decoder = codec[decoderName];
-  codecConfig.codec = codec;
-}
-CharLs().then(res => {
-  setCodec(codecWrapper, codecWrapper.encoderName, codecWrapper.decoderName, res);
-})
-export default {
-  data() {
-    return {
-    }
-  },
-  methods: {
-    async upload(name, file) {
-      let res = await this.OSSclient.put(name, file)
-      return res
-    },
-    beginScanFiles(e) {
-      var files = e.target.files
-      if (files.length > 0) {
-        files.forEach(async (item, index) => {
-          const reader = new FileReader();
-          reader.onload = async (event) => {
-            let buffer = event.target.result;
-            let data = dicomParser.parseDicom(new Uint8Array(buffer))
-            let height = data.uint16('x00280011')
-            let width = data.uint16('x00280010')
-            let bitsPerSample = data.uint16('x00280100')
-            let componentCount = data.string('x00280004')
-            let transportSyntax = data.string('x00020010')
-            if ((transportSyntax === '1.2.840.10008.1.2.1' || transportSyntax === '1.2.840.10008.1.2') && ~componentCount.indexOf('MONOCHROME')) {
-              let dataset = dcmjs.data.DicomMessage.readFile(buffer)
-              console.log(new dcmjs.data.DicomMetaDictionary(dataset))
-              let pixelDataElement = data.elements.x7fe00010;
-              let pixelDataOffset = pixelDataElement.dataOffset;
-              let pixelDataLength = pixelDataElement.length;
-              let pixelDataBytes = data.byteArray.subarray(pixelDataOffset, pixelDataOffset + pixelDataLength)
-              let encoder = new codecWrapper.Encoder();
-              let decodedBytes = encoder.getDecodedBuffer({width: width, height: height, bitsPerSample: bitsPerSample, componentCount: 1})
-              encoder.setNearLossless(0);
-              decodedBytes.set(pixelDataBytes);
-              encoder.encode()
-              let encodedBytes = encoder.getEncodedBuffer();
-              dataset.dict['7FE00010'].Value[0] = encodedBytes.buffer;
-              dataset.meta['00020010'].Value[0] = '1.2.840.10008.1.2.4.80';
-              let newDicomFile = dataset.write();
-              const bufferArray = new Uint8Array(newDicomFile);
-              const blob = new Blob([bufferArray], { type: 'application/octet-stream' });
-              await this.upload(`test/${index}.dcm`, blob)
-            }
-          };
-          reader.readAsArrayBuffer(item);
-        })
-      }
-    },
-    open() {
-      this.IsOpen = true
-    },
-    uploadOver(isSuccess, res) {
-      if (isSuccess) {
-        this.IsOpen = false
-        this.videoUrl = res.url
-        this.videoName = res.name
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>

src/views/trials/trials-layout/components/feedBack.vue

@@ -58,6 +58,7 @@ export default {
       this.$FB({
         type: "feedback",
         trialId: this.$route.query.trialId,
+        SubjectVisitId: this.$store.state.trials.checkTaskId,
       });
     },
     // 打开反馈列表
@@ -72,7 +73,7 @@ export default {
   position: fixed;
   bottom: 50px;
   right: -25px;
-  z-index: 1000;
+  z-index: 3000;
   width: 50px;
   height: 50px;
   background: rgba(64, 158, 255, 0.533);

src/views/trials/trials-list/index.vue

@@ -5,17 +5,13 @@
       <el-form :inline="true">
         <!-- 项目编号 -->
         <el-form-item :label="$t('trials:trials-list:table:trialId')">
-          <el-input
-            v-model="searchData.Code"
-            style="width:100px;"
-            clearable
-          />
+          <el-input v-model="searchData.Code" style="width: 100px" clearable />
         </el-form-item>
         <!-- 研究方案号 -->
         <el-form-item :label="$t('trials:trials-list:table:researchNumber')">
           <el-input
             v-model="searchData.ResearchProgramNo"
-            style="width:100px;"
+            style="width: 100px"
             clearable
           />
         </el-form-item>
@@ -23,7 +19,7 @@
         <el-form-item :label="$t('trials:trials-list:table:experimentName')">
           <el-input
             v-model="searchData.ExperimentName"
-            style="width:100px;"
+            style="width: 100px"
             clearable
           />
         </el-form-item>
@@ -32,11 +28,11 @@
         <el-form-item :label="$t('trials:trials-list:table:sponsor')">
           <el-select
             v-model="searchData.SponsorId"
-            style="width:150px;"
+            style="width: 150px"
             clearable
           >
             <el-option
-              v-for="(item) in sponsorList"
+              v-for="item in sponsorList"
               :key="item.Id"
               :label="item.SponsorName"
               :value="item.Id"
@@ -44,14 +40,17 @@
           </el-select>
         </el-form-item>
         <!-- 阅片标准 -->
-        <el-form-item :label="$t('trials:trials-list:table:IR_ReadingCriterionList')" v-if="hasPermi(['role:ir'])">
+        <el-form-item
+          :label="$t('trials:trials-list:table:IR_ReadingCriterionList')"
+          v-if="hasPermi(['role:ir'])"
+        >
           <el-select
             v-model="searchData.CriterionType"
-            style="width:150px;"
+            style="width: 150px"
             clearable
           >
             <el-option
-              v-for="(item) in $d.CriterionType"
+              v-for="item in $d.CriterionType"
               :key="item.id"
               :label="item.label"
               :value="item.value"
@@ -59,10 +58,13 @@
           </el-select>
         </el-form-item>
         <!-- 联系人 -->
-        <el-form-item :label="$t('trials:trials-list:table:IR_PMEmailList')" v-if="hasPermi(['role:ir'])">
-           <el-input
+        <el-form-item
+          :label="$t('trials:trials-list:table:IR_PMEmailList')"
+          v-if="hasPermi(['role:ir'])"
+        >
+          <el-input
             v-model="searchData.PM_EMail"
-            style="width:100px;"
+            style="width: 100px"
             clearable
           />
         </el-form-item>
@@ -70,26 +72,29 @@
           <!-- <el-button type="text" @click="isShow = !isShow">More</el-button> -->
           <!-- Search -->
           <el-button type="primary" icon="el-icon-search" @click="handleSearch">
-            {{ $t('common:button:search') }}
+            {{ $t("common:button:search") }}
           </el-button>
           <!-- Reset -->
-          <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
-            {{ $t('common:button:reset') }}
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
+            {{ $t("common:button:reset") }}
           </el-button>
           <!-- Export -->
           <el-button
             v-hasPermi="['trials:trials-list:export']"
             type="primary"
             icon="el-icon-download"
-            :disabled="!(selectArr.length>0)"
+            :loading="exportLoading"
             @click="handleExportTrial"
           >
-            {{ $t('common:button:export') }}
+            {{ $t("common:button:export") }}
           </el-button>
-
         </el-form-item>
       </el-form>
-      <span style="margin-left:auto;">
+      <span style="margin-left: auto">
         <!-- New -->
         <el-button
           v-hasPermi="['trials:trials-list:new']"
@@ -97,24 +102,20 @@
           type="primary"
           @click="handleNew"
         >
-          {{ $t('common:button:new') }}
+          {{ $t("common:button:new") }}
         </el-button>
       </span>
     </template>
 
     <!-- 更多搜索条件 -->
-    <el-drawer
-      :visible.sync="isShow"
-      :with-header="false"
-      size="390px"
-    >
-      <div style="padding:10px;">
+    <el-drawer :visible.sync="isShow" :with-header="false" size="390px">
+      <div style="padding: 10px">
         <el-form label-width="140px">
           <el-form-item label="Trial ID">
             <el-input
               v-model="searchData.Code"
               placeholder="Trial ID"
-              style="width:100%;"
+              style="width: 100%"
               clearable
             />
           </el-form-item>
@@ -122,7 +123,7 @@
             <el-input
               v-model="searchData.Indication"
               placeholder="Indication"
-              style="width:100%;"
+              style="width: 100%"
               clearable
             />
           </el-form-item>
@@ -130,7 +131,7 @@
             <el-select
               v-model="searchData.CriterionIds"
               placeholder="Assessment Criteria"
-              style="width:100%;"
+              style="width: 100%"
               clearable
               multiple
             >
@@ -152,11 +153,11 @@
             <el-select
               v-model="searchData.SponsorId"
               placeholder="Sponsor"
-              style="width:100%;"
+              style="width: 100%"
               clearable
             >
               <el-option
-                v-for="(item) in sponsorList"
+                v-for="item in sponsorList"
                 :key="item.Id"
                 :label="item.SponsorName"
                 :value="item.Id"
@@ -164,9 +165,14 @@
             </el-select>
           </el-form-item>
           <el-form-item label="CRO">
-            <el-select v-model="searchData.CROId" placeholder="CRO" style="width:100%;" clearable>
+            <el-select
+              v-model="searchData.CROId"
+              placeholder="CRO"
+              style="width: 100%"
+              clearable
+            >
               <el-option
-                v-for="(item) of croList"
+                v-for="item of croList"
                 :key="item.Id"
                 :label="item.CROName"
                 :value="item.Id"
@@ -177,7 +183,7 @@
             <el-select
               v-model="searchData.Phase"
               placeholder="Phase"
-              style="width:100%;"
+              style="width: 100%"
               clearable
             >
               <el-option
@@ -193,7 +199,7 @@
             <el-select
               v-model="searchData.ReviewTypeIds"
               placeholder="ReviewType"
-              style="width:100%;"
+              style="width: 100%"
               clearable
               multiple
             >
@@ -216,7 +222,7 @@
               v-model="searchData.ModalityIds"
               multiple
               placeholder="Modality"
-              style="width:100%;"
+              style="width: 100%"
               clearable
             >
               <!-- <el-option
@@ -234,7 +240,12 @@
             </el-select>
           </el-form-item>
           <el-form-item label="Expedited: ">
-            <el-select v-model="searchData.Expedited" value-key="value" clearable style="width:100%;">
+            <el-select
+              v-model="searchData.Expedited"
+              value-key="value"
+              clearable
+              style="width: 100%"
+            >
               <el-option
                 v-for="item in expeditedOption"
                 :key="item.value"
@@ -251,7 +262,7 @@
               type="date"
               :picker-options="beginPickerOption"
               :clearable="false"
-              style="width:100%;"
+              style="width: 100%"
             />
           </el-form-item>
           <el-form-item label="EndDate: ">
@@ -262,7 +273,7 @@
               type="date"
               :picker-options="endpickerOption"
               :clearable="false"
-              style="width:100%;"
+              style="width: 100%"
             />
           </el-form-item>
 
@@ -270,16 +281,23 @@
             <el-select
               v-model="searchData.AttendedReviewerType"
               placeholder="Attended Reviewer Type"
-              style="width:100%;"
+              style="width: 100%"
               clearable
             >
-              <el-option v-for="item of $d.AttendedReviewerType" :key="item.value" :label="item.label" :value="item.value" />
+              <el-option
+                v-for="item of $d.AttendedReviewerType"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
             </el-select>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" @click="handleSelectSearch">Search</el-button>
+            <el-button type="primary" @click="handleSelectSearch"
+              >Search</el-button
+            >
             <el-button type="primary" @click="handleReset">Reset</el-button>
-            <el-button type="primary" @click="isShow=false">Back</el-button>
+            <el-button type="primary" @click="isShow = false">Back</el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -288,7 +306,7 @@
     <!-- 项目列表 -->
     <template slot="main-container">
       <el-table
-        v-adaptive="{bottomOffset:60}"
+        v-adaptive="{ bottomOffset: 60 }"
         v-loading="listLoading"
         :data="list"
         stripe
@@ -336,10 +354,26 @@
           min-width="120"
         >
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.TrialStatusStr === 'Initializing'" type="info">{{ $fd('TrialStatusEnum', scope.row.TrialStatusStr) }}</el-tag>
-            <el-tag v-if="scope.row.TrialStatusStr === 'Ongoing'" type="primary">{{ $fd('TrialStatusEnum', scope.row.TrialStatusStr) }}</el-tag>
-            <el-tag v-if="scope.row.TrialStatusStr === 'Completed'" type="warning">{{ $fd('TrialStatusEnum', scope.row.TrialStatusStr) }}</el-tag>
-            <el-tag v-if="scope.row.TrialStatusStr === 'Stopped'" type="danger">{{ $fd('TrialStatusEnum', scope.row.TrialStatusStr) }}</el-tag>
+            <el-tag
+              v-if="scope.row.TrialStatusStr === 'Initializing'"
+              type="info"
+              >{{ $fd("TrialStatusEnum", scope.row.TrialStatusStr) }}</el-tag
+            >
+            <el-tag
+              v-if="scope.row.TrialStatusStr === 'Ongoing'"
+              type="primary"
+              >{{ $fd("TrialStatusEnum", scope.row.TrialStatusStr) }}</el-tag
+            >
+            <el-tag
+              v-if="scope.row.TrialStatusStr === 'Completed'"
+              type="warning"
+              >{{ $fd("TrialStatusEnum", scope.row.TrialStatusStr) }}</el-tag
+            >
+            <el-tag
+              v-if="scope.row.TrialStatusStr === 'Stopped'"
+              type="danger"
+              >{{ $fd("TrialStatusEnum", scope.row.TrialStatusStr) }}</el-tag
+            >
           </template>
         </el-table-column>
         <el-table-column
@@ -406,7 +440,7 @@
           min-width="160"
         >
           <template slot-scope="scope">
-            {{scope.row.IR_ReadingCriterionList.join(', ')}}
+            {{ scope.row.IR_ReadingCriterionList.join(", ") }}
           </template>
         </el-table-column>
         <el-table-column
@@ -441,7 +475,7 @@
           min-width="170"
         >
           <template slot-scope="scope">
-            {{scope.row.IR_PMEmailList.join(', ')}}
+            {{ scope.row.IR_PMEmailList.join(", ") }}
           </template>
         </el-table-column>
         <el-table-column
@@ -519,7 +553,9 @@
         <el-table-column
           v-if="hasPermi(['role:spm', 'role:cpm'])"
           prop="SPM_ReviewerSelectApprovalCount"
-          :label="$t('trials:trials-list:table:SPM_ReviewerSelectApprovalCount')"
+          :label="
+            $t('trials:trials-list:table:SPM_ReviewerSelectApprovalCount')
+          "
           show-overflow-tooltip
           sortable="custom"
           min-width="160"
@@ -543,7 +579,11 @@
               v-hasPermi="['trials:trials-list:panel']"
               circle
               icon="el-icon-info"
-              :disabled="(scope.row.TrialStatusStr === 'Initializing' && !hasPermi(['role:pm'])) || scope.row.IsDeleted"
+              :disabled="
+                (scope.row.TrialStatusStr === 'Initializing' &&
+                  !hasPermi(['role:pm'])) ||
+                scope.row.IsDeleted
+              "
               :title="$t('trials:trials-list:action:panel')"
               @click.stop="handleDetail(scope.row)"
             />
@@ -570,19 +610,22 @@
               v-hasPermi="['trials:trials-list:abolish']"
               circle
               icon="el-icon-delete"
-              :disabled="scope.row.IsDeleted || scope.row.TrialStatusStr !== 'Initializing'"
+              :disabled="
+                scope.row.IsDeleted ||
+                scope.row.TrialStatusStr !== 'Initializing'
+              "
               :title="$t('trials:trials-list:action:abolition')"
               @click.stop="handleAbandon(scope.row)"
             />
-<!--             代办详情-->
-<!--            <el-button-->
-<!--              v-hasPermi="['trials:trials-list:abolish']"-->
-<!--              circle-->
-<!--              icon="el-icon-receiving"-->
-<!--              :disabled="scope.row.TrialStatusStr === 'Initializing'"-->
-<!--              :title="$t('trials:trials-list:action:commission')"-->
-<!--              @click.stop="handleCommission(scope.row)"-->
-<!--            />-->
+            <!--             代办详情-->
+            <!--            <el-button-->
+            <!--              v-hasPermi="['trials:trials-list:abolish']"-->
+            <!--              circle-->
+            <!--              icon="el-icon-receiving"-->
+            <!--              :disabled="scope.row.TrialStatusStr === 'Initializing'"-->
+            <!--              :title="$t('trials:trials-list:action:commission')"-->
+            <!--              @click.stop="handleCommission(scope.row)"-->
+            <!--            />-->
           </template>
         </el-table-column>
       </el-table>
@@ -606,7 +649,11 @@
       append-to-body
       custom-class="base-dialog-wrapper"
     >
-      <TrialForm :trial-id="currentId" @getList="getList" @closeDialog="closeDialog" />
+      <TrialForm
+        :trial-id="currentId"
+        @getList="getList"
+        @closeDialog="closeDialog"
+      />
     </el-dialog>
 
     <!-- 修改项目状态 -->
@@ -619,7 +666,11 @@
       custom-class="base-dialog-wrapper"
       append-to-body
     >
-      <TrialStatusForm :data="currentRow" @closeDialog="closeStatusDialog" @getList="getList" />
+      <TrialStatusForm
+        :data="currentRow"
+        @closeDialog="closeStatusDialog"
+        @getList="getList"
+      />
     </el-dialog>
 
     <el-dialog
@@ -630,51 +681,66 @@
       append-to-body
       custom-class="base-dialog-wrapper"
     >
-      <DoneList :trial-id="currentId" @getList="getList" @closeDialog="doneDialogVisible = false" />
+      <DoneList
+        :trial-id="currentId"
+        @getList="getList"
+        @closeDialog="doneDialogVisible = false"
+      />
     </el-dialog>
   </BaseContainer>
 </template>
 <script>
-import { abandonTrial, ifTrialCanOngoing, getTrialToBeDoneList } from '@/api/trials'
-import store from '@/store'
-import { mapGetters } from 'vuex'
-import Excel from 'exceljs'
-import BaseContainer from '@/components/BaseContainer'
-import Pagination from '@/components/Pagination'
-import TrialForm from './components/TrialForm'
-import TrialStatusForm from './components/TrialStatusForm'
-import DoneList from './components/DoneList'
+import {
+  abandonTrial,
+  ifTrialCanOngoing,
+  getTrialToBeDoneList,
+} from "@/api/trials";
+import { getTrialList_Export } from "@/api/export";
+import store from "@/store";
+import { mapGetters } from "vuex";
+import BaseContainer from "@/components/BaseContainer";
+import Pagination from "@/components/Pagination";
+import TrialForm from "./components/TrialForm";
+import TrialStatusForm from "./components/TrialStatusForm";
+import DoneList from "./components/DoneList";
 const searchDataDefault = () => {
   return {
-    Code: '',
+    Code: "",
     CriterionIds: [],
-    SponsorId: '',
+    SponsorId: "",
     ReviewTypeIds: [],
-    CROId: '',
-    Expedited: '',
-    Indication: '',
-    Phase: '',
+    CROId: "",
+    Expedited: "",
+    Indication: "",
+    Phase: "",
     ModalityIds: [],
-    BeginDate: '',
-    EndDate: '',
-    AttendedReviewerType: '',
-    ResearchProgramNo: '',
-    ExperimentName: '',
+    BeginDate: "",
+    EndDate: "",
+    AttendedReviewerType: "",
+    ResearchProgramNo: "",
+    ExperimentName: "",
     PageIndex: 1,
     PageSize: 20,
     Asc: false,
-    SortField: '',
-    CriterionType:null,
-    PM_EMail:null,
-  }
-}
+    SortField: "",
+    CriterionType: null,
+    PM_EMail: null,
+  };
+};
 export default {
-  name: 'Trials',
-  components: { Pagination, BaseContainer, TrialForm, TrialStatusForm, DoneList },
-  dicts: ['ReadingStandard', 'ReviewType', 'ReadingType'],
+  name: "Trials",
+  components: {
+    Pagination,
+    BaseContainer,
+    TrialForm,
+    TrialStatusForm,
+    DoneList,
+  },
+  dicts: ["ReadingStandard", "ReviewType", "ReadingType"],
   data() {
     return {
-      userTypeEnumInt: zzSessionStorage.getItem('userTypeEnumInt') * 1,
+      exportLoading: false,
+      userTypeEnumInt: zzSessionStorage.getItem("userTypeEnumInt") * 1,
       doneDialogVisible: false,
       doneTitle: null,
       selectArr: [],
@@ -684,192 +750,228 @@ export default {
       total: 0,
       isShow: false,
       dialogVisible: false,
-      title: '',
-      currentId: '',
+      title: "",
+      currentId: "",
       statusVisible: false,
       currentRow: {},
-      currentUser: zzSessionStorage.getItem('userName'),
+      currentUser: zzSessionStorage.getItem("userName"),
       phaseOptions: [
-        { value: 'I' },
-        { value: 'II' },
-        { value: 'III' },
-        { value: 'IV' }
+        { value: "I" },
+        { value: "II" },
+        { value: "III" },
+        { value: "IV" },
       ],
       expeditedOption: this.$d.TrialExpeditedState,
       beginPickerOption: {
-        disabledDate: time => {
+        disabledDate: (time) => {
           if (this.searchData.EndDate) {
-            return time.getTime() > new Date(this.searchData.EndDate).getTime()
+            return time.getTime() > new Date(this.searchData.EndDate).getTime();
           } else {
-            return time.getTime() > Date.now()
+            return time.getTime() > Date.now();
           }
-        }
+        },
       },
       endpickerOption: {
-        disabledDate: time => {
+        disabledDate: (time) => {
           if (this.searchData.BeginDate) {
-            return time.getTime() > Date.now() || time.getTime() <= new Date(this.searchData.BeginDate).getTime()
+            return (
+              time.getTime() > Date.now() ||
+              time.getTime() <= new Date(this.searchData.BeginDate).getTime()
+            );
           } else {
-            return time.getTime() > Date.now()
+            return time.getTime() > Date.now();
           }
-        }
-      }
-    }
+        },
+      },
+    };
   },
   computed: {
-    ...mapGetters(['sponsorList', 'croList'])
+    ...mapGetters(["sponsorList", "croList"]),
   },
   created() {
-    this.initPage()
+    this.initPage();
   },
   methods: {
     initPage() {
-      this.getList()
-      store.dispatch('global/getSponsorList')
-      store.dispatch('global/getCROList')
+      this.getList();
+      store.dispatch("global/getSponsorList");
+      store.dispatch("global/getCROList");
     },
     // 获取项目列表信息
     getList() {
-      this.listLoading = true
+      this.listLoading = true;
       getTrialToBeDoneList(this.searchData)
-        .then(res => {
-          this.list = res.Result.CurrentPageData
-          this.total = res.Result.TotalCount
-          this.listLoading = false
+        .then((res) => {
+          this.list = res.Result.CurrentPageData;
+          this.total = res.Result.TotalCount;
+          this.listLoading = false;
         })
         .catch(() => {
-          this.listLoading = false
-        })
+          this.listLoading = false;
+        });
     },
 
     // 查询
     handleSearch() {
-      this.searchData.PageIndex = 1
-      this.getList()
+      this.searchData.PageIndex = 1;
+      this.getList();
     },
     // 查询
     handleSelectSearch() {
-      this.searchData.PageIndex = 1
-      this.getList()
-      this.isShow = false
+      this.searchData.PageIndex = 1;
+      this.getList();
+      this.isShow = false;
     },
     // 重置
     handleReset() {
-      this.searchData = searchDataDefault()
-      this.getList()
+      this.searchData = searchDataDefault();
+      this.getList();
     },
     // 新增项目
     handleNew() {
       // this.$router.push({ name: 'CreateTrial' })
-      this.title = this.$t('trials:trials-list:dialogTitle:new')
-      this.currentId = ''
-      this.dialogVisible = true
+      this.title = this.$t("trials:trials-list:dialogTitle:new");
+      this.currentId = "";
+      this.dialogVisible = true;
     },
     // 编辑项目
     handleEdit(row) {
-      this.title = this.$t('trials:trials-list:dialogTitle:edit')
-      this.currentId = row.Id
-      this.dialogVisible = true
+      this.title = this.$t("trials:trials-list:dialogTitle:edit");
+      this.currentId = row.Id;
+      this.dialogVisible = true;
     },
     handleCommission(row) {
-      this.doneTitle = this.$t('trials:trials-list:dialogTitle:doneTitle')
-      this.currentId = row.Id
-      this.doneDialogVisible = true
+      this.doneTitle = this.$t("trials:trials-list:dialogTitle:doneTitle");
+      this.currentId = row.Id;
+      this.doneDialogVisible = true;
     },
     closeDialog() {
-      this.dialogVisible = false
+      this.dialogVisible = false;
     },
     // 状态
     handleStatus(row) {
-      if (row.TrialStatusStr === 'Initializing') {
-        this.listLoading = true
-        ifTrialCanOngoing(row.Id).then(res => {
-          this.listLoading = false
-          if (res.Result) {
-            this.currentRow = { ...row }
-            this.statusVisible = true
-          } else {
-            this.$confirm(res.ErrorMessage, {
-              type: 'warning',
-              showCancelButton: false,
-              callback: action => {}
-            })
-          }
-        }).catch(() => { this.listLoading = false })
+      if (row.TrialStatusStr === "Initializing") {
+        this.listLoading = true;
+        ifTrialCanOngoing(row.Id)
+          .then((res) => {
+            this.listLoading = false;
+            if (res.Result) {
+              this.currentRow = { ...row };
+              this.statusVisible = true;
+            } else {
+              this.$confirm(res.ErrorMessage, {
+                type: "warning",
+                showCancelButton: false,
+                callback: (action) => {},
+              });
+            }
+          })
+          .catch(() => {
+            this.listLoading = false;
+          });
       } else {
-        this.currentRow = { ...row }
-        this.statusVisible = true
+        this.currentRow = { ...row };
+        this.statusVisible = true;
       }
     },
     closeStatusDialog() {
-      this.statusVisible = false
+      this.statusVisible = false;
     },
     // 废除
     handleAbandon(row) {
-      this.$confirm(this.$t('trials:trials-list:message:abolition'), {
-        type: 'warning',
-        distinguishCancelAndClose: true
-      }).then(() => {
-        this.currentRow = { ...row }
-        this.abandonTrial()
-      }).catch(() => {})
+      this.$confirm(this.$t("trials:trials-list:message:abolition"), {
+        type: "warning",
+        distinguishCancelAndClose: true,
+      })
+        .then(() => {
+          this.currentRow = { ...row };
+          this.abandonTrial();
+        })
+        .catch(() => {});
     },
     // 废除项目
     abandonTrial() {
-      this.listLoading = true
+      this.listLoading = true;
       abandonTrial(this.currentRow.Id, true)
-        .then(res => {
-          this.listLoading = false
+        .then((res) => {
+          this.listLoading = false;
           if (res.IsSuccess) {
-            this.getList()
-            this.$message.success(this.$t('trials:trials-list:message:abolitionSuccessfully'))
+            this.getList();
+            this.$message.success(
+              this.$t("trials:trials-list:message:abolitionSuccessfully")
+            );
           }
-        }).catch(() => { this.listLoading = false })
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
     },
     rowClick(row, col) {
-      if (row.TrialStatusStr === 'Initializing' && !this.hasPermi(['role:pm']) || row.IsDeleted) return
-      this.$router.push({ path: `/trials/trials-panel?trialId=${row.Id}&trialCode=${row.TrialCode}&researchProgramNo=${row.ResearchProgramNo}` })
+      if (
+        (row.TrialStatusStr === "Initializing" &&
+          !this.hasPermi(["role:pm"])) ||
+        row.IsDeleted
+      )
+        return;
+      this.$router.push({
+        path: `/trials/trials-panel?trialId=${row.Id}&trialCode=${row.TrialCode}&researchProgramNo=${row.ResearchProgramNo}`,
+      });
     },
     // panel
     handleDetail(row) {
-      this.$router.push({ path: `/trials/trials-panel?trialId=${row.Id}&trialCode=${row.TrialCode}&researchProgramNo=${row.ResearchProgramNo}` })
+      this.$router.push({
+        path: `/trials/trials-panel?trialId=${row.Id}&trialCode=${row.TrialCode}&researchProgramNo=${row.ResearchProgramNo}`,
+      });
     },
     // 获取已勾选行数据
     handleSelectChange(val) {
-      const arr = []
+      const arr = [];
       for (let index = 0; index < val.length; index++) {
-        arr.push(val[index])
+        arr.push(val[index]);
       }
-      this.selectArr = arr
+      this.selectArr = arr;
     },
     // 排序
     handleSortChange(column) {
-      if (column.order === 'ascending') {
-        this.searchData.Asc = true
+      if (column.order === "ascending") {
+        this.searchData.Asc = true;
       } else {
-        this.searchData.Asc = false
-      } if (column.prop === 'Criterion') {
-        this.searchData.SortField = 'CriterionId'
-      } else {
-        this.searchData.SortField = column.prop
+        this.searchData.Asc = false;
       }
-      this.searchData.PageIndex = 1
-      this.getList()
+      if (column.prop === "Criterion") {
+        this.searchData.SortField = "CriterionId";
+      } else {
+        this.searchData.SortField = column.prop;
+      }
+      this.searchData.PageIndex = 1;
+      this.getList();
     },
     // 导出Excel表格
     handleExportTrial() {
+      this.exportLoading = true;
+      let data = {
+        ...this.searchData,
+      };
+      data.TrialIdList = this.selectArr.map((item) => item.Id);
+      return getTrialList_Export(data)
+        .then((res) => {
+          this.exportLoading = false;
+        })
+        .catch(() => {
+          this.exportLoading = false;
+        });
       this.selectArr.forEach((element, index) => {
         // element.ExpeditedStr = element.Expedited === 0 ? 'No' : element.Expedited === 1 ? '24H' : '48H'
         // element.ModalityListStr = element.ModalityList.join(', ')
         // element.CreateTimeStr = element.CreateTime
         // element.Criterion = element.CriterionList.join(', ')
-        element.Deleted = element.IsDeleted ? 'Yes' : 'No'
-        element.Index = (index + 1)
-      })
-      var workbook = new Excel.Workbook()
-      var sheet = workbook.addWorksheet('Trials')
+        element.Deleted = element.IsDeleted ? "Yes" : "No";
+        element.Index = index + 1;
+      });
+      var workbook = new Excel.Workbook();
+      var sheet = workbook.addWorksheet("Trials");
 
-      sheet.properties.defaultRowHeight = 22
+      sheet.properties.defaultRowHeight = 22;
       // sheet.columns = [
       //   { key: 'Index', width: 5 },
       //   { key: 'Code', width: 15 },
@@ -885,102 +987,96 @@ export default {
       //   { key: 'CreateTimeStr', width: 18 }
       // ]
       sheet.columns = [
-        { key: 'Index', width: 5 },
-        { key: 'TrialCode', width: 25 },
-        { key: 'ExperimentName', width: 25 },
-        { key: 'ResearchProgramNo', width: 25 },
-        { key: 'Sponsor', width: 25 },
-        { key: 'Deleted', width: 10 },
-        { key: 'CreateTime', width: 25 }
-      ]
+        { key: "Index", width: 5 },
+        { key: "TrialCode", width: 25 },
+        { key: "ExperimentName", width: 25 },
+        { key: "ResearchProgramNo", width: 25 },
+        { key: "Sponsor", width: 25 },
+        { key: "Deleted", width: 10 },
+        { key: "CreateTime", width: 25 },
+      ];
 
       // 处理标题
-      sheet.mergeCells('A1', 'G2')
-      sheet.getCell('A1').value = 'Trials'
-      sheet.getCell('A1').alignment = {
-        vertical: 'middle',
-        horizontal: 'center'
-      }
-      sheet.getCell('A1').font = {
-        name: 'SimSun',
+      sheet.mergeCells("A1", "G2");
+      sheet.getCell("A1").value = "Trials";
+      sheet.getCell("A1").alignment = {
+        vertical: "middle",
+        horizontal: "center",
+      };
+      sheet.getCell("A1").font = {
+        name: "SimSun",
         family: 4,
         size: 13,
-        bold: true
-      }
-      sheet.mergeCells('A3', 'G3')
-      var now = new Date()
-      sheet.getCell('A3').value = now.toLocaleDateString()
-      sheet.getCell('A3').alignment = {
-        vertical: 'middle',
-        horizontal: 'right'
-      }
+        bold: true,
+      };
+      sheet.mergeCells("A3", "G3");
+      var now = new Date();
+      sheet.getCell("A3").value = now.toLocaleDateString();
+      sheet.getCell("A3").alignment = {
+        vertical: "middle",
+        horizontal: "right",
+      };
 
       sheet.getRow(4).values = [
-        'NO.',
-        'Trial ID',
-        '试验名称',
-        '研究方案号',
-        '申办方',
-        '是否废除',
-        'Date Created'
-      ]
+        "NO.",
+        "Trial ID",
+        "试验名称",
+        "研究方案号",
+        "申办方",
+        "是否废除",
+        "Date Created",
+      ];
       sheet.getRow(4).font = {
-        name: 'SimSun',
+        name: "SimSun",
         family: 4,
         size: 11,
-        bold: true
-      }
-      sheet.getRow(4).alignment = { vertical: 'middle', horizontal: 'left' }
+        bold: true,
+      };
+      sheet.getRow(4).alignment = { vertical: "middle", horizontal: "left" };
 
-      sheet.addRows(this.selectArr)
+      sheet.addRows(this.selectArr);
 
       sheet.eachRow((row, number) => {
         if (number > 3) {
           row.eachCell((cell, rowNumber) => {
-            cell.alignment = { vertical: 'center', horizontal: 'left' }
+            cell.alignment = { vertical: "center", horizontal: "left" };
             cell.border = {
-              top: { style: 'thin' },
-              left: { style: 'thin' },
-              bottom: { style: 'thin' },
-              right: { style: 'thin' }
-            }
-          })
+              top: { style: "thin" },
+              left: { style: "thin" },
+              bottom: { style: "thin" },
+              right: { style: "thin" },
+            };
+          });
         }
-      })
+      });
 
       workbook.xlsx
         .writeBuffer({
-          base64: true
+          base64: true,
         })
-        .then(function(xls64) {
+        .then(function (xls64) {
           var data = new Blob([xls64], {
-            type:
-              'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-          })
+            type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+          });
 
-          if ('msSaveOrOpenBlob' in navigator) {
+          if ("msSaveOrOpenBlob" in navigator) {
             // ie使用的下载方式
-            window.navigator.msSaveOrOpenBlob(
-              data,
-              'Trials' + '.xlsx'
-            )
+            window.navigator.msSaveOrOpenBlob(data, "Trials" + ".xlsx");
           } else {
-            var a = document.createElement('a')
+            var a = document.createElement("a");
 
-            var url = URL.createObjectURL(data)
-            a.href = url
-            a.download =
-                'Trials' + '.xlsx'
-            document.body.appendChild(a)
-            a.click()
-            setTimeout(function() {
-              document.body.removeChild(a)
-              window.URL.revokeObjectURL(url)
-            }, 0)
+            var url = URL.createObjectURL(data);
+            a.href = url;
+            a.download = "Trials" + ".xlsx";
+            document.body.appendChild(a);
+            a.click();
+            setTimeout(function () {
+              document.body.removeChild(a);
+              window.URL.revokeObjectURL(url);
+            }, 0);
           }
-        })
-    }
-
-  }
-}
+        });
+    },
+  },
+};
 </script>

src/views/trials/trials-panel/attachments/attachment-management/index.vue

@@ -5,10 +5,7 @@
       <el-form :inline="true">
         <!-- 文件类型 -->
         <el-form-item :label="$t('trials:signRecords:table:fileType')">
-          <el-select
-            v-model="searchData.FileTypeId"
-            style="width:150px;"
-          >
+          <el-select v-model="searchData.FileTypeId" style="width: 150px">
             <el-option
               v-for="item of typeOptions"
               :key="item.FileTypeId"
@@ -19,19 +16,31 @@
         </el-form-item>
         <!-- 文件名称 -->
         <el-form-item :label="$t('trials:signRecords:table:fileName')">
-          <el-input v-model="searchData.Name" style="width:120px;" />
+          <el-input v-model="searchData.Name" style="width: 120px" />
         </el-form-item>
         <!-- 签署人 -->
         <el-form-item :label="$t('trials:signRecords:table:user')">
-          <el-select v-model="searchData.UserId" clearable filterable style="width:140px;">
+          <el-select
+            v-model="searchData.UserId"
+            clearable
+            filterable
+            style="width: 140px"
+          >
             <el-option
-              v-for="(item) of userOptions"
+              v-for="item of userOptions"
               :key="item.UserId"
               :label="item.RealName"
               :value="item.UserId"
             >
               <span style="float: left">{{ item.RealName }}</span>
-              <span style="float: right; color: #8492a6; font-size: 13px;margin-left:5px;">
+              <span
+                style="
+                  float: right;
+                  color: #8492a6;
+                  font-size: 13px;
+                  margin-left: 5px;
+                "
+              >
                 {{ item.UserName }}
               </span>
             </el-option>
@@ -43,7 +52,7 @@
             v-model="searchData.UserTypeId"
             clearable
             filterable
-            style="width:120px;"
+            style="width: 120px"
           >
             <el-option
               v-for="item of userTypeOptions"
@@ -57,23 +66,54 @@
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('trials:signRecords:table:isSign')">
-          <el-select v-model="searchData.IsConfirmed" clearable style="width:120px;">
-            <el-option v-for="i of $d.YesOrNo" :key="'IsConfirmed' + i.label" :value="i.value" :label="i.label" />
+          <el-select
+            v-model="searchData.IsConfirmed"
+            clearable
+            style="width: 120px"
+          >
+            <el-option
+              v-for="i of $d.YesOrNo"
+              :key="'IsConfirmed' + i.label"
+              :value="i.value"
+              :label="i.label"
+            />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('trials:signRecords:table:isDeleted')">
-          <el-select v-model="searchData.IsDeleted" clearable style="width:120px;">
-            <el-option v-for="i of $d.YesOrNo" :key="'IsDeleted' + i.label" :value="i.value" :label="i.label" />
+          <el-select
+            v-model="searchData.IsDeleted"
+            clearable
+            style="width: 120px"
+          >
+            <el-option
+              v-for="i of $d.YesOrNo"
+              :key="'IsDeleted' + i.label"
+              :value="i.value"
+              :label="i.label"
+            />
           </el-select>
         </el-form-item>
         <el-form-item>
           <!-- 查询 -->
           <el-button icon="el-icon-search" type="primary" @click="handleSearch">
-            {{ $t('common:button:search') }}
+            {{ $t("common:button:search") }}
           </el-button>
           <!-- 重置 -->
-          <el-button icon="el-icon-refresh-left" type="primary" @click="handleReset">
-            {{ $t('common:button:reset') }}
+          <el-button
+            icon="el-icon-refresh-left"
+            type="primary"
+            @click="handleReset"
+          >
+            {{ $t("common:button:reset") }}
+          </el-button>
+          <!-- 导出 -->
+          <el-button
+            type="primary"
+            icon="el-icon-download"
+            :loading="exportLoading"
+            @click="handleExport"
+          >
+            {{ $t("common:button:export") }}
           </el-button>
         </el-form-item>
       </el-form>
@@ -84,7 +124,7 @@
       <el-table
         ref="AttachmentsManagement"
         v-loading="loading"
-        v-adaptive="{bottomOffset:60}"
+        v-adaptive="{ bottomOffset: 60 }"
         :data="list"
         stripe
         height="100"
@@ -115,8 +155,12 @@
           sortable="custom"
         >
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.IsSystemDoc" type="primary">{{ $fd('IsSystemDoc', scope.row.IsSystemDoc) }}</el-tag>
-            <el-tag v-else type="warning">{{ $fd('IsSystemDoc', scope.row.IsSystemDoc) }}</el-tag>
+            <el-tag v-if="scope.row.IsSystemDoc" type="primary">{{
+              $fd("IsSystemDoc", scope.row.IsSystemDoc)
+            }}</el-tag>
+            <el-tag v-else type="warning">{{
+              $fd("IsSystemDoc", scope.row.IsSystemDoc)
+            }}</el-tag>
           </template>
         </el-table-column>
         <!-- 是否废除 -->
@@ -127,8 +171,12 @@
           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>
+            <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>
         <!-- 上传时间 -->
@@ -147,8 +195,12 @@
           sortable="custom"
         >
           <template slot-scope="scope">
-            <el-tag v-if="!scope.row.IsConfirmed" type="primary">{{ $fd('YesOrNo', scope.row.IsConfirmed) }}</el-tag>
-            <el-tag v-else type="danger">{{ $fd('YesOrNo', scope.row.IsConfirmed) }}</el-tag>
+            <el-tag v-if="!scope.row.IsConfirmed" type="primary">{{
+              $fd("YesOrNo", scope.row.IsConfirmed)
+            }}</el-tag>
+            <el-tag v-else type="danger">{{
+              $fd("YesOrNo", scope.row.IsConfirmed)
+            }}</el-tag>
           </template>
         </el-table-column>
         <!-- 签署人 -->
@@ -193,7 +245,13 @@
       </el-table>
 
       <!-- 分页组件 -->
-      <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize" @pagination="getList" />
+      <pagination
+        class="page"
+        :total="total"
+        :page.sync="searchData.PageIndex"
+        :limit.sync="searchData.PageSize"
+        @pagination="getList"
+      />
     </template>
 
     <!-- 预览文件 -->
@@ -205,32 +263,45 @@
       append-to-body
       custom-class="base-dialog-wrapper"
     >
-      <div class="base-modal-body" style="border:2px solid #ccc;padding: 10px">
-        <PreviewFile v-if="previewVisible" :file-path="currentPath" :file-type="currentType" @getList="getList" />
+      <div
+        class="base-modal-body"
+        style="border: 2px solid #ccc; padding: 10px"
+      >
+        <PreviewFile
+          v-if="previewVisible"
+          :file-path="currentPath"
+          :file-type="currentType"
+          @getList="getList"
+        />
       </div>
     </el-dialog>
   </BaseContainer>
 </template>
 <script>
-import { getDocumentConfirmList, getTrialUserSelect, getTrialUserTypeList, getTrialDocAndSystemDocType } from '@/api/trials'
-import BaseContainer from '@/components/BaseContainer'
-import Pagination from '@/components/Pagination'
-import PreviewFile from '@/components/PreviewFile/index'
-import store from '@/store'
+import {
+  getDocumentConfirmList,
+  getTrialUserSelect,
+  getTrialUserTypeList,
+  getTrialDocAndSystemDocType,
+} from "@/api/trials";
+import { pMTrainingRecordList_Export } from "@/api/export";
+import BaseContainer from "@/components/BaseContainer";
+import Pagination from "@/components/Pagination";
+import PreviewFile from "@/components/PreviewFile/index";
 const searchDataDefault = () => {
   return {
-    FileTypeId: '',
-    Name: '',
-    UserId: '',
-    UserTypeId: '',
+    FileTypeId: "",
+    Name: "",
+    UserId: "",
+    UserTypeId: "",
     PageIndex: 1,
     PageSize: 20,
     IsConfirmed: null,
-    IsDeleted: null
-  }
-}
+    IsDeleted: null,
+  };
+};
 export default {
-  name: 'AttachmentsManagement',
+  name: "AttachmentsManagement",
   components: { BaseContainer, Pagination, PreviewFile },
   data() {
     return {
@@ -239,84 +310,99 @@ export default {
       list: [],
       total: 0,
       currentRow: {},
-      currentPath: '',
-      currentType: '',
+      currentPath: "",
+      currentType: "",
       previewVisible: false,
       userOptions: [],
       userTypeOptions: [],
-      currentUser: zzSessionStorage.getItem('userName'),
+      currentUser: zzSessionStorage.getItem("userName"),
       typeOptions: [],
-      trialId: this.$route.query.trialId
-    }
+      trialId: this.$route.query.trialId,
+      exportLoading: false,
+    };
   },
   mounted() {
-    this.getTypeOptions()
-    this.getUserSelect()
-    this.getUserType()
-    this.getList()
+    this.getTypeOptions();
+    this.getUserSelect();
+    this.getUserType();
+    this.getList();
   },
   methods: {
+    handleExport() {
+      this.exportLoading = true;
+      pMTrainingRecordList_Export(this.searchData)
+        .then(() => {
+          this.exportLoading = false;
+        })
+        .catch((err) => {
+          this.exportLoading = false;
+        });
+    },
     // 获取系统文件数据
     getList() {
-      this.loading = true
-      this.searchData.TrialId = this.trialId
-      getDocumentConfirmList(this.searchData).then(async res => {
-        this.loading = false
-        this.list = res.Result.CurrentPageData
-        this.total = res.Result.TotalCount
-        console.log(this.total)
-      }).catch(() => {
-        this.loading = false
-      })
+      this.loading = true;
+      this.searchData.TrialId = this.trialId;
+      getDocumentConfirmList(this.searchData)
+        .then(async (res) => {
+          this.loading = false;
+          this.list = res.Result.CurrentPageData;
+          this.total = res.Result.TotalCount;
+          console.log(this.total);
+        })
+        .catch(() => {
+          this.loading = false;
+        });
     },
     // 获取文件类型下拉数据
     getTypeOptions() {
-      getTrialDocAndSystemDocType(this.trialId).then(res => {
-        this.typeOptions = res.Result
-      })
+      getTrialDocAndSystemDocType(this.trialId).then((res) => {
+        this.typeOptions = res.Result;
+      });
     },
     // 获取当前项目下参与者信息
     getUserSelect() {
-      getTrialUserSelect(this.trialId).then(res => {
-        this.userOptions = res.Result
-      })
+      getTrialUserSelect(this.trialId).then((res) => {
+        this.userOptions = res.Result;
+      });
     },
     // 获取用户类型下拉数据
     getUserType() {
-      getTrialUserTypeList().then(res => {
-        this.userTypeOptions = res.Result
-      })
+      getTrialUserTypeList().then((res) => {
+        this.userTypeOptions = res.Result;
+      });
     },
     // 预览
     handlePreview(row) {
-      this.currentRow = { ...row }
-      const { Name, FullFilePath } = row
-      this.currentPath = FullFilePath
-      this.currentType = row.Name ? Name.substring(Name.lastIndexOf('.') + 1).toLocaleLowerCase() : ''
-      this.previewVisible = true
+      this.currentRow = { ...row };
+      const { Name, FullFilePath } = row;
+      this.currentPath = FullFilePath;
+      this.currentType = row.Name
+        ? Name.substring(Name.lastIndexOf(".") + 1).toLocaleLowerCase()
+        : "";
+      this.previewVisible = true;
     },
     // 重置
     handleReset() {
-      this.searchData = searchDataDefault()
-      this.getList()
+      this.searchData = searchDataDefault();
+      this.getList();
       this.$nextTick(() => {
-        this.$refs.AttachmentsManagement.clearSort()
-      })
+        this.$refs.AttachmentsManagement.clearSort();
+      });
     },
     // 查询
     handleSearch() {
-      this.getList()
+      this.getList();
     },
     // 排序
     handleSortByColumn(column) {
-      if (column.order === 'ascending') {
-        this.searchData.Asc = true
+      if (column.order === "ascending") {
+        this.searchData.Asc = true;
       } else {
-        this.searchData.Asc = false
+        this.searchData.Asc = false;
       }
-      this.searchData.SortField = column.prop
-      this.getList()
-    }
-  }
-}
+      this.searchData.SortField = column.prop;
+      this.getList();
+    },
+  },
+};
 </script>

src/views/trials/trials-panel/attachments/enrollment/components/Submission.vue

@@ -231,7 +231,13 @@ export default {
       window.open(href, '_blank')
     },
     handleDownloadAll() {
-      this.dialogVisible = true
+      // 英文环境直接下载
+      if (process.env.NODE_ENV === 'usa') {
+        this.language = 2
+        this.handleDownloadResumes()
+      } else {
+        this.dialogVisible = true
+      }
     },
     getFileData(fileUrl) {
       return new Promise((resolve, reject) => {
@@ -285,11 +291,16 @@ export default {
         language: this.language
       }).then(async res => {
         this.selectTable = {};
-        for (let i = 0; res.Result.length > i; i++) {
-          let item = res.Result[i]
-          await this.handleBatchDown(item)
-        }
         this.dialogVisible = false
+        if (!res.Result || res.Result.length === 0) {
+          this.$alert(this.$t('trials:seletctedReviews:table:noResume'))
+        }else{
+          for (let i = 0; res.Result.length > i; i++) {
+            let item = res.Result[i]
+            await this.handleBatchDown(item)
+          }
+        }
+        
       }).catch(err=>{
         this.dialogVisible = false;
         this.selectTable= {};
@@ -305,9 +316,14 @@ export default {
       downloadResume(this.$route.query.trialId, this.language, arr).then(res => { window.open(res.Result) })
     },
     handleDownload(row) { 
-      // this.downloadResume([row.Id]) 
-      this.dialogVisible = true;
-      this.selectTable = row;
+      this.selectTable = row
+      // 英文环境直接下载
+      if (process.env.NODE_ENV === 'usa') {
+        this.language = 2
+        this.handleDownloadResumes()
+      } else {
+        this.dialogVisible = true
+      }
     }
   }
 }

src/views/trials/trials-panel/enrolled-reviewers/list/components/UploadAcksow.vue

@@ -14,7 +14,7 @@
       accept=".pdf"
     >
       <el-button size="small" type="primary" :loading="btnDisabled">{{ $t('trials:enrolledReviews:button:upload') }}</el-button>
-      <span slot="tip" class="el-upload__tip">{{ `(${$t('trials:enrolledReviews:label:mustBepdf')})` }}</span>
+      <span slot="tip" class="el-upload__tip">{{ $t('system:tip:file:pdf') }}</span>
     </el-upload>
   </div>
 </template>

src/views/trials/trials-panel/enrolled-reviewers/list/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <BaseContainer>
+  <BaseContainer class="enroll-list">
     <!-- <template slot="search-container">
       <el-button
         v-hasPermi="['trials:trials-panel:enrolled-reviewers:list:enroll']"
@@ -96,16 +96,15 @@
           <el-table-column
             :label="$t('trials:enrolledReviews:table:readingType')"
             width="300"
-            show-overflow-tooltip
           >
             <template slot-scope="scope">
-              <span v-for="item of scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}) ? scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).ReadingCategorys : []" :key="item.TrialReadingCriterionId">
-                <el-tag v-if="item === 1" type="primary">{{ $fd('ReadingCategory', item) + ' & ' + $fd('ReadingCategory', 2) }}</el-tag>
-                <!--              <el-tag v-if="item === 2" type="info">{{ $fd('ReadingCategory', item) }}</el-tag>-->
-                <el-tag v-if="item === 4" type="danger">{{ $fd('ReadingCategory', item) }}</el-tag>
-                <el-tag v-if="item === 5" type="warning">{{ $fd('ReadingCategory', item) }}</el-tag>
-              </span>
-              <el-button
+                <span v-for="item of scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}) ? scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).ReadingCategorys : []" :key="item.TrialReadingCriterionId" style="margin:5px 5px 5px 0;">
+                  <el-tag v-if="item === 1" type="primary">{{ $fd('ReadingCategory', item) + ' & ' + $fd('ReadingCategory', 2) }}</el-tag>
+                  <!--              <el-tag v-if="item === 2" type="info">{{ $fd('ReadingCategory', item) }}</el-tag>-->
+                  <el-tag v-if="item === 4" type="danger">{{ $fd('ReadingCategory', item) }}</el-tag>
+                  <el-tag v-if="item === 5" type="warning">{{ $fd('ReadingCategory', item) }}</el-tag>
+                </span>
+                <el-button
                 v-hasPermi="['trials:trials-panel:enrolled-reviewers:list:edit']"
                 type="text"
                 @click="openSetEnrollReadingCategory(scope.row, ite.TrialReadingCriterionId)"
@@ -249,7 +248,7 @@
       </template>
     </base-model>
     <!-- 修改 readingCategory -->
-    <base-model :config="readingCategory_model">
+    <base-model :config="readingCategory_model" class="readingCategory_model">
       <template slot="dialog-body">
         <!-- Reading Type -->
         <label>{{ $t('trials:enrolledReviews:table:readingType') }}: </label>
@@ -259,7 +258,7 @@
           allow-create
           multiple
           default-first-option
-          style="width: 70%"
+          style="width: 50%;"
         >
           <template v-for="item of $d.ReadingCategory">
             <el-option  v-if="item.value === 1" :key="item.id" :value="1" :label="$fd('ReadingCategory', 1) + ' & ' + $fd('ReadingCategory', 2)" /> 
@@ -273,20 +272,22 @@
         </el-select>
       </template>
       <template slot="dialog-footer">
-        <el-button
+        <div style="margin-top:30px;">
+          <el-button
           :disabled="readingCategory_model.btnLoading"
           type="primary"
           @click="readingCategory_model.visible = false"
-        >
-          {{ $t('common:button:cancel') }}
-        </el-button>
-        <el-button
-          type="primary"
-          :loading="readingCategory_model.btnLoading"
-          @click="handleUpdateReadingCategory"
-        >
-          {{ $t('common:button:save') }}
-        </el-button>
+          >
+            {{ $t('common:button:cancel') }}
+          </el-button>
+          <el-button
+            type="primary"
+            :loading="readingCategory_model.btnLoading"
+            @click="handleUpdateReadingCategory"
+          >
+            {{ $t('common:button:save') }}
+          </el-button>
+        </div>
       </template>
     </base-model>
     <!-- 修改医生状态 -->
@@ -432,7 +433,7 @@ export default {
         visible: false,
         title: this.$t('trials:enrolledReviews:dialogTitle:changeReadingType'),
         showClose: true,
-        width: '500px',
+        width: '600px',
         btnLoading: false
       },
       reviewerStatus_model: {
@@ -833,10 +834,11 @@ export default {
 <style lang="scss">
   .enroll-list {
     height: 100%;
-    .filter-box {
-      display: flex;
-      align-items: center;
-      padding: 5px 0px;
+    .readingCategory_model{
+      .base-modal-body{
+        min-height: 150px;
+        padding-bottom: 30px !important;
+      }
     }
   }
 </style>

src/views/trials/trials-panel/reading/consistency-analysis/components/DoctorConsistentRuleSubjectTable.vue

@@ -7,10 +7,15 @@
         :data="list"
         stripe
         height="100"
-        style="min-height: 400px;"
+        style="min-height: 400px"
         @selection-change="handleSelectChange"
       >
-        <el-table-column :selectable="selectable" type="selection" align="left" width="45" />
+        <el-table-column
+          :selectable="selectable"
+          type="selection"
+          align="left"
+          width="45"
+        />
         <!-- 中心编号 -->
         <el-table-column
           prop="TrialSiteCode"
@@ -35,25 +40,44 @@
           sortable="custom"
           show-overflow-tooltip
         />
+        <!-- 原截至访视 -->
+        <el-table-column
+          prop="FirstGlobalVisitName"
+          :label="
+            $t('trials:grouptConsistencyAnalysis:table:firstGlobalVisitName')
+          "
+          min-width="160"
+          sortable="custom"
+          show-overflow-tooltip
+          v-if="OtherInfo.IsGenerateGlobalTask && OtherInfo.IsHaveReadingPeriod"
+        />
         <!-- 是否受到退回影响 -->
-<!--        <el-table-column-->
-<!--          prop="IsReReadingOrBackInfluenceAnalysis"-->
-<!--          :label="$t('trials:grouptConsistencyAnalysis:table:backImpact')"-->
-<!--          min-width="160"-->
-<!--          sortable="custom"-->
-<!--          show-overflow-tooltip>-->
-<!--          <template slot-scope="scope">-->
-<!--            <el-tag v-if="!scope.row.IsReReadingOrBackInfluenceAnalysis" type="danger">{{ $fd('YesOrNo', scope.row.IsReReadingOrBackInfluenceAnalysis) }}</el-tag>-->
-<!--            <el-tag v-if="scope.row.IsReReadingOrBackInfluenceAnalysis" type="primary">{{ $fd('YesOrNo', scope.row.IsReReadingOrBackInfluenceAnalysis) }}</el-tag>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
+        <!--        <el-table-column-->
+        <!--          prop="IsReReadingOrBackInfluenceAnalysis"-->
+        <!--          :label="$t('trials:grouptConsistencyAnalysis:table:backImpact')"-->
+        <!--          min-width="160"-->
+        <!--          sortable="custom"-->
+        <!--          show-overflow-tooltip>-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <el-tag v-if="!scope.row.IsReReadingOrBackInfluenceAnalysis" type="danger">{{ $fd('YesOrNo', scope.row.IsReReadingOrBackInfluenceAnalysis) }}</el-tag>-->
+        <!--            <el-tag v-if="scope.row.IsReReadingOrBackInfluenceAnalysis" type="primary">{{ $fd('YesOrNo', scope.row.IsReReadingOrBackInfluenceAnalysis) }}</el-tag>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
       </el-table>
 
       <!-- 分页组件 -->
-      <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize" @pagination="getList" />
+      <pagination
+        class="page"
+        :total="total"
+        :page.sync="searchData.PageIndex"
+        :limit.sync="searchData.PageSize"
+        @pagination="getList"
+      />
     </div>
-    <div v-else>{{$t('trials:grouptConsistencyAnalysis:message:createRandom')}}</div>
-    <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
+    <div v-else>
+      {{ $t("trials:grouptConsistencyAnalysis:message:createRandom") }}
+    </div>
+    <div class="base-dialog-footer" style="text-align: right; margin-top: 10px">
       <el-form-item>
         <!-- 取消 -->
         <el-button
@@ -62,39 +86,59 @@
           type="primary"
           @click="close"
         >
-          {{ $t('common:button:cancel') }}
+          {{ $t("common:button:cancel") }}
         </el-button>
         <!-- 生成 -->
-        <el-button size="small" type="primary" :loading="btnLoading" @click="save">
-          {{data.IsAutoAllocateGenerateTask ? $t('trials:grouptConsistencyAnalysis:button:createRandom') : $t('trials:grouptConsistencyAnalysis:button:create')}}
+        <el-button
+          size="small"
+          type="primary"
+          :loading="btnLoading"
+          @click="save"
+        >
+          {{
+            data.IsAutoAllocateGenerateTask
+              ? $t("trials:grouptConsistencyAnalysis:button:createRandom")
+              : $t("trials:grouptConsistencyAnalysis:button:create")
+          }}
         </el-button>
       </el-form-item>
     </div>
   </el-form>
 </template>
 <script>
-import { getDoctorSelfConsistentRuleSubjectList, confirmGenerateSelfConsistentTask, getDoctorConsistentRuleSubjectList, confirmGenerateConsistentTask } from '@/api/trials/reading'
-import BaseContainer from '@/components/BaseContainer'
-import Pagination from '@/components/Pagination'
+import {
+  getDoctorSelfConsistentRuleSubjectList,
+  confirmGenerateSelfConsistentTask,
+  getDoctorConsistentRuleSubjectList,
+  confirmGenerateConsistentTask,
+} from "@/api/trials/reading";
+import BaseContainer from "@/components/BaseContainer";
+import Pagination from "@/components/Pagination";
 const searchDataDefault = () => {
   return {
     PageIndex: 1,
     PageSize: 20,
     Asc: true,
-    SortField: '',
+    SortField: "",
     TrialId: null,
-    TaskConsistentRuleId: null
-  }
-}
+    TaskConsistentRuleId: null,
+  };
+};
 export default {
-  name: 'TrialsNotice',
+  name: "TrialsNotice",
   components: { BaseContainer, Pagination },
   props: {
     data: {
       type: Object,
       default() {
-        return {}
-      }
+        return {};
+      },
+    },
+    OtherInfo: {
+      type: Object,
+      default() {
+        return {};
+      },
     },
   },
   data() {
@@ -105,71 +149,82 @@ export default {
       loading: false,
       trialId: this.$route.query.trialId,
       SelectList: [],
-      btnLoading: false
-    }
+      btnLoading: false,
+    };
   },
   mounted() {
-    this.searchData.TaskConsistentRuleId = this.data.Id
-    this.searchData.DoctorUserId = this.data.AnalysisDoctorUser.UserId
-    this.getList()
+    this.searchData.TaskConsistentRuleId = this.data.Id;
+    this.searchData.DoctorUserId = this.data.AnalysisDoctorUser.UserId;
+    this.getList();
   },
   methods: {
     selectable(row) {
       if (row.IsHaveGeneratedTask) {
-        return false
+        return false;
       } else {
-        return true
+        return true;
       }
     },
     handleSelectChange(e) {
-      this.SelectList = e
+      this.SelectList = e;
     },
-    save () {
-      if (this.SelectList.length === 0 && !this.data.IsAutoAllocateGenerateTask) {
+    save() {
+      if (
+        this.SelectList.length === 0 &&
+        !this.data.IsAutoAllocateGenerateTask
+      ) {
         // '请选择要生成的受试者'
-        this.$alert(this.$t('trials:grouptConsistencyAnalysis:message:msg1'))
-        return
+        this.$alert(this.$t("trials:grouptConsistencyAnalysis:message:msg1"));
+        return;
       }
-      this.btnLoading = true
-      this.loading = true
+      this.btnLoading = true;
+      this.loading = true;
       var params = {
         TaskConsistentRuleId: this.searchData.TaskConsistentRuleId,
-        SubejctIdList: this.SelectList.map(v => v.SubjectId),
+        SubejctIdList: this.SelectList.map((v) => v.SubjectId),
         DoctorUserId: this.searchData.DoctorUserId,
-        IsAutoAllocateGenerateTask: this.data.IsAutoAllocateGenerateTask
-      }
-      confirmGenerateSelfConsistentTask(params).then(res => {
-        this.loading = false
-        this.btnLoading = false
-        this.$message.success(this.$t('common:message:savedSuccessfully'))
-        this.$emit('getList')
-        this.close()
-      }).catch(() => {
-        this.loading = false
-        this.btnLoading = false
-      })
+        IsAutoAllocateGenerateTask: this.data.IsAutoAllocateGenerateTask,
+      };
+      confirmGenerateSelfConsistentTask(params)
+        .then((res) => {
+          this.loading = false;
+          this.btnLoading = false;
+          this.$message.success(this.$t("common:message:savedSuccessfully"));
+          this.$emit("getList");
+          this.close();
+        })
+        .catch(() => {
+          this.loading = false;
+          this.btnLoading = false;
+        });
     },
     getList() {
-      this.searchData.TrialId = this.$route.query.trialId
-      this.loading = true
-      getDoctorSelfConsistentRuleSubjectList(this.searchData).then(res => {
-        this.loading = false
-        this.list = res.Result.CurrentPageData
-        this.total = res.Result.TotalCount
-      }).catch(() => { this.loading = false })
+      this.searchData.TrialId = this.$route.query.trialId;
+      this.loading = true;
+      getDoctorSelfConsistentRuleSubjectList(this.searchData)
+        .then((res) => {
+          this.loading = false;
+          this.list = res.Result.CurrentPageData;
+          this.total = res.Result.TotalCount;
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
+    close() {
+      this.$emit("close");
     },
-    close() { this.$emit('close') },
     // 排序
     handleSortChange(column) {
-      if (column.order === 'ascending') {
-        this.searchData.Asc = true
+      if (column.order === "ascending") {
+        this.searchData.Asc = true;
       } else {
-        this.searchData.Asc = false
+        this.searchData.Asc = false;
       }
-      this.searchData.SortField = column.prop
-      this.searchData.PageIndex = 1
-      this.getList()
-    }
-  }
-}
+      this.searchData.SortField = column.prop;
+      this.searchData.PageIndex = 1;
+      this.getList();
+    },
+  },
+};
 </script>

src/views/trials/trials-panel/reading/consistency-analysis/components/GroupConsistentRuleSubjectTable.vue

@@ -7,10 +7,15 @@
         :data="list"
         stripe
         height="100"
-        style="min-height: 400px;"
+        style="min-height: 400px"
         @selection-change="handleSelectChange"
       >
-        <el-table-column :selectable="selectable" type="selection" align="left" width="45" />
+        <el-table-column
+          :selectable="selectable"
+          type="selection"
+          align="left"
+          width="45"
+        />
         <!-- 中心编号 -->
         <el-table-column
           prop="TrialSiteCode"
@@ -36,7 +41,11 @@
           show-overflow-tooltip
         >
           <template slot-scope="scope">
-            {{scope.row.DoctorUserList.map(v => {return `${v.UserName} (${v.FullName})`}).join(', ')}}
+            {{
+              scope.row.DoctorUserList.map((v) => {
+                return `${v.UserName} (${v.FullName})`;
+              }).join(", ")
+            }}
           </template>
         </el-table-column>
         <!-- 符合规则访视数 -->
@@ -47,13 +56,30 @@
           sortable="custom"
           show-overflow-tooltip
         />
+        <!-- 原截至访视 -->
+        <el-table-column
+          prop="FirstGlobalVisitName"
+          :label="
+            $t('trials:grouptConsistencyAnalysis:table:firstGlobalVisitName')
+          "
+          min-width="160"
+          sortable="custom"
+          show-overflow-tooltip
+          v-if="OtherInfo.IsGenerateGlobalTask && OtherInfo.IsHaveReadingPeriod"
+        />
       </el-table>
       <!-- 分页组件 -->
       <div style="text-align: right">
-        <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize" @pagination="getList" />
+        <pagination
+          class="page"
+          :total="total"
+          :page.sync="searchData.PageIndex"
+          :limit.sync="searchData.PageSize"
+          @pagination="getList"
+        />
       </div>
     </div>
-    <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
+    <div class="base-dialog-footer" style="text-align: right; margin-top: 10px">
       <el-form-item>
         <!-- 取消 -->
         <el-button
@@ -62,64 +88,86 @@
           type="primary"
           @click="close"
         >
-          {{ $t('common:button:cancel') }}
+          {{ $t("common:button:cancel") }}
         </el-button>
-        <el-button size="small" type="primary" :disabled="!IsAllowAutoAllocate" :loading="btnLoading" @click="save(true)">
-          {{$t('trials:grouptConsistencyAnalysis:button:RandomCreate')}}
+        <el-button
+          size="small"
+          type="primary"
+          :disabled="!IsAllowAutoAllocate"
+          :loading="btnLoading"
+          @click="save(true)"
+        >
+          {{ $t("trials:grouptConsistencyAnalysis:button:RandomCreate") }}
         </el-button>
         <!-- 生成 -->
-        <el-button size="small" type="primary" :loading="btnLoading" @click="save(false)">
-          {{$t('trials:grouptConsistencyAnalysis:button:create')}}
+        <el-button
+          size="small"
+          type="primary"
+          :loading="btnLoading"
+          @click="save(false)"
+        >
+          {{ $t("trials:grouptConsistencyAnalysis:button:create") }}
         </el-button>
       </el-form-item>
     </div>
   </el-form>
 </template>
 <script>
-import { getGroupConsistentRuleSubjectList, confirmGenerateGroupConsistentTask, getDoctorConsistentRuleSubjectList, confirmGenerateConsistentTask } from '@/api/trials/reading'
-import BaseContainer from '@/components/BaseContainer'
-import Pagination from '@/components/Pagination'
+import {
+  getGroupConsistentRuleSubjectList,
+  confirmGenerateGroupConsistentTask,
+  getDoctorConsistentRuleSubjectList,
+  confirmGenerateConsistentTask,
+} from "@/api/trials/reading";
+import BaseContainer from "@/components/BaseContainer";
+import Pagination from "@/components/Pagination";
 const searchDataDefault = () => {
   return {
     PageIndex: 1,
     PageSize: 20,
     Asc: true,
-    SortField: '',
+    SortField: "",
     TrialId: null,
-    TaskConsistentRuleId: null
-  }
-}
+    TaskConsistentRuleId: null,
+  };
+};
 export default {
-  name: 'TrialsNotice',
+  name: "TrialsNotice",
   components: { BaseContainer, Pagination },
   props: {
     changeNum: {
       type: Number,
       default() {
-        return 0
-      }
+        return 0;
+      },
     },
     IsSelfAnalysis: {
       type: Boolean,
       default() {
-        return false
-      }
+        return false;
+      },
     },
-    TrialReadingCriterionId:{
-      type:String,
-      required:true
+    TrialReadingCriterionId: {
+      type: String,
+      required: true,
     },
     data: {
       type: Object,
       default() {
-        return {}
-      }
+        return {};
+      },
+    },
+    OtherInfo: {
+      type: Object,
+      default() {
+        return {};
+      },
     },
   },
   watch: {
     changeNum(v) {
-      this.getList()
-    }
+      this.getList();
+    },
   },
   data() {
     return {
@@ -130,77 +178,85 @@ export default {
       trialId: this.$route.query.trialId,
       SelectList: [],
       btnLoading: false,
-      IsAllowAutoAllocate: true
-    }
+      IsAllowAutoAllocate: true,
+    };
   },
   mounted() {
-    this.getList()
+    this.getList();
   },
   methods: {
     selectable(row) {
       if (row.IsHaveGeneratedTask) {
-        return false
+        return false;
       } else {
-        return true
+        return true;
       }
     },
     handleSelectChange(e) {
-      this.SelectList = e
+      this.SelectList = e;
     },
-    save (IsAutoAllocateGenerateTask) {
+    save(IsAutoAllocateGenerateTask) {
       if (this.SelectList.length === 0) {
         // '请选择要生成的受试者'
-        this.$alert(this.$t('trials:grouptConsistencyAnalysis:message:msg1'))
-        return
+        this.$alert(this.$t("trials:grouptConsistencyAnalysis:message:msg1"));
+        return;
       }
-      this.btnLoading = true
-      this.loading = true
+      this.btnLoading = true;
+      this.loading = true;
       var params = {
         TrialId: this.$route.query.trialId,
-        SubejctIdList: this.SelectList.map(v => v.SubjectId),
+        SubejctIdList: this.SelectList.map((v) => v.SubjectId),
         IsAutoAllocateGenerateTask: IsAutoAllocateGenerateTask,
-        TrialReadingCriterionId: this.TrialReadingCriterionId
-      }
-      confirmGenerateGroupConsistentTask(params).then(res => {
-        this.loading = false
-        this.btnLoading = false
-        // '保存成功'
-        this.$message.success(this.$t('common:message:savedSuccessfully'))
-        this.close()
-        this.$emit('getList')
-      }).catch(() => {
-        this.loading = false
-        this.btnLoading = false
-      })
+        TrialReadingCriterionId: this.TrialReadingCriterionId,
+      };
+      confirmGenerateGroupConsistentTask(params)
+        .then((res) => {
+          this.loading = false;
+          this.btnLoading = false;
+          // '保存成功'
+          this.$message.success(this.$t("common:message:savedSuccessfully"));
+          this.close();
+          this.$emit("getList");
+        })
+        .catch(() => {
+          this.loading = false;
+          this.btnLoading = false;
+        });
     },
     getList() {
-      this.searchData.TrialId = this.$route.query.trialId
-      this.loading = true
-      this.searchData.TrialReadingCriterionId = this.TrialReadingCriterionId
-      getGroupConsistentRuleSubjectList(this.searchData).then(res => {
-        if (res.OtherInfo.Rule) {
-          this.$emit('setReaderRulesFormVisible', false)
-        } else {
-          this.$emit('setReaderRulesFormVisible', true)
-        }
-        this.IsAllowAutoAllocate = res.OtherInfo.IsAllowAutoAllocate
-        this.loading = false
-        this.list = res.Result.CurrentPageData
-        this.total = res.Result.TotalCount
-      }).catch(() => { this.loading = false })
+      this.searchData.TrialId = this.$route.query.trialId;
+      this.loading = true;
+      this.searchData.TrialReadingCriterionId = this.TrialReadingCriterionId;
+      getGroupConsistentRuleSubjectList(this.searchData)
+        .then((res) => {
+          if (res.OtherInfo.Rule) {
+            this.$emit("setReaderRulesFormVisible", false);
+          } else {
+            this.$emit("setReaderRulesFormVisible", true);
+          }
+          this.IsAllowAutoAllocate = res.OtherInfo.IsAllowAutoAllocate;
+          this.loading = false;
+          this.list = res.Result.CurrentPageData;
+          this.total = res.Result.TotalCount;
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
+    close() {
+      this.$emit("close");
     },
-    close() { this.$emit('close') },
     // 排序
     handleSortChange(column) {
-      if (column.order === 'ascending') {
-        this.searchData.Asc = true
+      if (column.order === "ascending") {
+        this.searchData.Asc = true;
       } else {
-        this.searchData.Asc = false
+        this.searchData.Asc = false;
       }
-      this.searchData.SortField = column.prop
-      this.searchData.PageIndex = 1
-      this.getList()
-    }
-  }
-}
+      this.searchData.SortField = column.prop;
+      this.searchData.PageIndex = 1;
+      this.getList();
+    },
+  },
+};
 </script>

src/views/trials/trials-panel/reading/consistency-analysis/components/ReaderRulesForm.vue

@@ -10,39 +10,105 @@
   >
     <div class="base-dialog-body">
       <!-- 访视数 -->
-      <el-form-item :label="$t('trials:consistencyAnalysisRule:table:visitNum')" prop="PlanVisitCount">
-        <el-input-number v-model="form.PlanVisitCount" :disabled="isDisable" :min="0" controls-position="right" />
+      <el-form-item
+        :label="$t('trials:consistencyAnalysisRule:table:visitNum')"
+        prop="PlanVisitCount"
+      >
+        <el-input-number
+          v-model="form.PlanVisitCount"
+          :disabled="isDisable"
+          :min="1"
+          controls-position="right"
+        />
       </el-form-item>
       <!-- 所选访视是否有阅片期 -->
-      <el-form-item :label="$t('trials:consistencyAnalysisRule:table:isReadingPeriod')" prop="IsHaveReadingPeriod">
-        <el-radio-group v-model="form.IsHaveReadingPeriod" :disabled="isDisable" @change="form.IsGenerateGlobalTask = form.IsHaveReadingPeriod">
-          <el-radio v-for="item of $d.YesOrNo" :key="'form.IsHaveReadingPeriod' + item.value" :label="item.value">{{ item.label }}</el-radio>
+      <el-form-item
+        :label="$t('trials:consistencyAnalysisRule:table:isReadingPeriod')"
+        prop="IsHaveReadingPeriod"
+      >
+        <el-radio-group
+          v-model="form.IsHaveReadingPeriod"
+          :disabled="isDisable || ruleOtherInfo.IsReadingTaskViewInOrder !== 1"
+          @change="form.IsGenerateGlobalTask = form.IsHaveReadingPeriod"
+        >
+          <el-radio
+            v-for="item of $d.YesOrNo"
+            :key="'form.IsHaveReadingPeriod' + item.value"
+            :label="item.value"
+            >{{ item.label }}</el-radio
+          >
         </el-radio-group>
       </el-form-item>
       <!-- 间隔周期（周） -->
-      <el-form-item v-if="isSelfAnalysis" :label="$t('trials:consistencyAnalysisRule:table:intervalPeriod')" prop="IntervalWeeks">
-        <el-input-number v-model="form.IntervalWeeks" :min="0" :disabled="isDisable" controls-position="right" />
+      <el-form-item
+        v-if="isSelfAnalysis"
+        :label="$t('trials:consistencyAnalysisRule:table:intervalPeriod')"
+        prop="IntervalWeeks"
+      >
+        <el-input-number
+          v-model="form.IntervalWeeks"
+          :min="0"
+          :disabled="isDisable"
+          controls-position="right"
+        />
       </el-form-item>
       <!-- 计划病例数 -->
-      <el-form-item :label="$t('trials:consistencyAnalysisRule:table:plannedNum')" prop="PlanSubjectCount">
-        <el-input-number v-model="form.PlanSubjectCount" :min="0" :disabled="isDisable" controls-position="right" />
+      <el-form-item
+        :label="$t('trials:consistencyAnalysisRule:table:plannedNum')"
+        prop="PlanSubjectCount"
+      >
+        <el-input-number
+          v-model="form.PlanSubjectCount"
+          :min="0"
+          :disabled="isDisable"
+          controls-position="right"
+        />
       </el-form-item>
       <!-- 虚拟中心编号 -->
-      <el-form-item  :label="$t('trials:consistencyAnalysisRule:table:siteCode')" prop="BlindTrialSiteCode">
-        <el-input v-model="form.BlindTrialSiteCode" maxlength="10" style="width: 140px;" :disabled="!!Result.BlindTrialSiteCode || !!OtherInfo.VitrualSiteCode" @input="(v)=>(form.BlindTrialSiteCode = v.replace(/[^\a-\z\A-\Z0-9]/g, ''))"/>
+      <el-form-item
+        :label="$t('trials:consistencyAnalysisRule:table:siteCode')"
+        prop="BlindTrialSiteCode"
+      >
+        <el-input
+          v-model="form.BlindTrialSiteCode"
+          maxlength="10"
+          style="width: 140px"
+          :disabled="!!Result.BlindTrialSiteCode || !!OtherInfo.VitrualSiteCode"
+          @input="
+            (v) =>
+              (form.BlindTrialSiteCode = v.replace(/[^\a-\z\A-\Z0-9]/g, ''))
+          "
+        />
       </el-form-item>
       <!-- 虚拟受试者位数 -->
-      <el-form-item  :label="$t('trials:consistencyAnalysisRule:table:subjectNum')" prop="BlindSubjectNumberOfPlaces">
-        <el-input-number v-model="form.BlindSubjectNumberOfPlaces" :min="1" :disabled="isDisable" :max="5" controls-position="right" />
+      <el-form-item
+        :label="$t('trials:consistencyAnalysisRule:table:subjectNum')"
+        prop="BlindSubjectNumberOfPlaces"
+      >
+        <el-input-number
+          v-model="form.BlindSubjectNumberOfPlaces"
+          :min="1"
+          :disabled="isDisable"
+          :max="5"
+          controls-position="right"
+        />
       </el-form-item>
       <!-- 是否生成全局阅片任务 -->
-      <el-form-item :label="$t('trials:consistencyAnalysisRule:table:isGenerateGlobalTask')" prop="IsGenerateGlobalTask">
+      <el-form-item
+        :label="$t('trials:consistencyAnalysisRule:table:isGenerateGlobalTask')"
+        prop="IsGenerateGlobalTask"
+      >
         <el-radio-group v-model="form.IsGenerateGlobalTask" disabled>
-          <el-radio v-for="item of $d.YesOrNo" :key="'form.IsGenerateGlobalTask' + item.value" :label="item.value">{{ item.label }}</el-radio>
+          <el-radio
+            v-for="item of $d.YesOrNo"
+            :key="'form.IsGenerateGlobalTask' + item.value"
+            :label="item.value"
+            >{{ item.label }}</el-radio
+          >
         </el-radio-group>
       </el-form-item>
     </div>
-    <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
+    <div class="base-dialog-footer" style="text-align: right; margin-top: 10px">
       <el-form-item>
         <!-- 取消 -->
         <el-button
@@ -51,64 +117,73 @@
           type="primary"
           @click="close"
         >
-          {{ $t('common:button:cancel') }}
+          {{ $t("common:button:cancel") }}
         </el-button>
         <!-- 保存 -->
-        <el-button size="small" type="primary" :loading="btnLoading" :disabled="isDisable" @click="save">
-          {{ $t('common:button:save') }}
+        <el-button
+          size="small"
+          type="primary"
+          :loading="btnLoading"
+          :disabled="isDisable"
+          @click="save"
+        >
+          {{ $t("common:button:save") }}
         </el-button>
       </el-form-item>
     </div>
   </el-form>
 </template>
 <script>
-import { getConsistentRule, addOrUpdateTaskConsistentRule } from '@/api/trials/reading'
+import {
+  getConsistentRule,
+  addOrUpdateTaskConsistentRule,
+} from "@/api/trials/reading";
 
 export default {
-  name: 'AddOrUpdateTaskAllocationRuleData',
+  name: "AddOrUpdateTaskAllocationRuleData",
   props: {
     TrialReadingCriterionId: {
       type: String,
       default() {
-        return ''
-      }
+        return "";
+      },
     },
     OtherInfo: {
       type: Object,
       default() {
-        return {}
-      }
+        return {};
+      },
     },
     trialCriterionList: {
       type: Array,
       default() {
-        return []
-      }
+        return [];
+      },
     },
     data: {
       type: Object,
       default() {
-        return {}
-      }
+        return {};
+      },
     },
     isDisable: {
       type: Boolean,
       default() {
-        return true
-      }
+        return true;
+      },
     },
     isSelfAnalysis: {
       type: Boolean,
       default() {
-        return true
-      }
+        return true;
+      },
     },
     doctorUserList: {
       type: Array,
       default() {
-        return []
-      }
-    }
+        return [];
+      },
+    },
   },
   data() {
     return {
@@ -120,81 +195,133 @@ export default {
         IntervalWeeks: 3,
         IsHaveReadingPeriod: null,
         IsGenerateGlobalTask: null,
-        BlindTrialSiteCode: '',
+        BlindTrialSiteCode: "",
         BlindSubjectNumberOfPlaces: 3,
         IsEnable: true,
-        Note: ''
+        Note: "",
       },
-      Result:{}, // 接口返回弹窗数据，用于虚拟中心可编辑校验
+      Result: {}, // 接口返回弹窗数据，用于虚拟中心可编辑校验
       rules: {
-        IsHaveReadingPeriod: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
-        IsGenerateGlobalTask: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
-        PlanSubjectCount: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }],
-        IntervalWeeks: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }],
-        PlanVisitCount: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }],
-        BlindTrialSiteCode: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }],
-        BlindSubjectNumberOfPlaces: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }],
+        IsHaveReadingPeriod: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:select"),
+            trigger: "blur",
+          },
+        ],
+        IsGenerateGlobalTask: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:select"),
+            trigger: "blur",
+          },
+        ],
+        PlanSubjectCount: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: "blur",
+          },
+        ],
+        IntervalWeeks: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: "blur",
+          },
+        ],
+        PlanVisitCount: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: "blur",
+          },
+        ],
+        BlindTrialSiteCode: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: "blur",
+          },
+        ],
+        BlindSubjectNumberOfPlaces: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: "blur",
+          },
+        ],
       },
       loading: false,
-      btnLoading: false
-    }
+      btnLoading: false,
+      ruleOtherInfo: {},
+    };
   },
   mounted() {
     // this.form.TrialId = this.$route.query.trialId
     // if (Object.keys(this.data).length && this.data.Id) {
     //   this.form = { ...this.data }
     // }
-    this.getFrom()
+    this.getFrom();
   },
-  watch:{
-    "OtherInfo.VitrualSiteCode":{
-      handler(){
+  watch: {
+    "OtherInfo.VitrualSiteCode": {
+      handler() {
         this.form.BlindTrialSiteCode = this.OtherInfo.VitrualSiteCode;
-      }
-    }
+      },
+    },
   },
   methods: {
     getFrom() {
       getConsistentRule({
         TrialId: this.$route.query.trialId,
         IsSelfAnalysis: this.isSelfAnalysis,
-        TrialReadingCriterionId: this.TrialReadingCriterionId
-      }).then(res => {
-        if (res.Result) {
-          this.form = res.Result;
-          this.Result = JSON.parse(JSON.stringify(res.Result));
+        TrialReadingCriterionId: this.TrialReadingCriterionId,
+      }).then((res) => {
+        this.ruleOtherInfo =
+          { IsReadingTaskViewInOrder: res.Result.IsReadingTaskViewInOrder } ||
+          {};
+        if (res.Result.ConsistentRuleBasic) {
+          this.form = res.Result.ConsistentRuleBasic;
+          this.Result = JSON.parse(
+            JSON.stringify(res.Result.ConsistentRuleBasic)
+          );
         } else {
-          let o = this.trialCriterionList.find(v => {
-            return v.TrialReadingCriterionId === this.TrialReadingCriterionId
-          })
-          this.form.IsHaveReadingPeriod = o.IsReadingPeriod
-          this.form.IsGenerateGlobalTask = o.IsReadingPeriod
+          let o = this.trialCriterionList.find((v) => {
+            return v.TrialReadingCriterionId === this.TrialReadingCriterionId;
+          });
+          this.form.IsHaveReadingPeriod = o.IsReadingPeriod;
+          this.form.IsGenerateGlobalTask = o.IsReadingPeriod;
         }
-        this.form.BlindTrialSiteCode = this.OtherInfo.VitrualSiteCode
-      })
+        this.form.BlindTrialSiteCode = this.OtherInfo.VitrualSiteCode;
+      });
     },
     save() {
-      this.$refs.taskAllocationRuleDataForm.validate(valid => {
-        if (!valid) return
-        this.btnLoading = true
-        this.loading = true
-        this.form.IsSelfAnalysis = this.isSelfAnalysis
-        this.form.TrialReadingCriterionId = this.TrialReadingCriterionId
-        addOrUpdateTaskConsistentRule(this.form).then(res => {
-          this.loading = false
-          this.btnLoading = false
-          this.$message.success(this.$t('common:message:savedSuccessfully'))
-          this.$emit('close')
-          this.$emit('getList')
-        }).catch(() => {
-          this.loading = false
-          this.btnLoading = false
-        })
-      })
+      this.$refs.taskAllocationRuleDataForm.validate((valid) => {
+        if (!valid) return;
+        this.btnLoading = true;
+        this.loading = true;
+        this.form.IsSelfAnalysis = this.isSelfAnalysis;
+        this.form.TrialReadingCriterionId = this.TrialReadingCriterionId;
+        addOrUpdateTaskConsistentRule(this.form)
+          .then((res) => {
+            this.loading = false;
+            this.btnLoading = false;
+            this.$message.success(this.$t("common:message:savedSuccessfully"));
+            this.$emit("close");
+            this.$emit("getList");
+          })
+          .catch(() => {
+            this.loading = false;
+            this.btnLoading = false;
+          });
+      });
     },
-    close() { this.$emit('close') }
-  }
-}
+    close() {
+      this.$emit("close");
+    },
+  },
+};
 </script>
 <style lang="scss" scoped>
 </style>

src/views/trials/trials-panel/reading/consistency-analysis/index.vue

@@ -592,7 +592,10 @@
               @click="setAnalysisTaskInvalid(scope.row)"
             />
             <el-button
-              :disabled="scope.row.TaskState !== 1"
+              :disabled="
+                scope.row.TaskState !== 1 ||
+                scope.row.ConsistentClinicalDataCount <= 0
+              "
               v-if="
                 hasPermi([
                   'trials:trials-panel:reading:consistency-analysis:edit',
@@ -832,7 +835,12 @@
                     <el-button
                       circle
                       icon="el-icon-connection"
-                      :disabled="scope.row.CanGeneratedSubejctCount === 0"
+                      :disabled="
+                        scope.row.GeneratedSubjectCount > 0 ||
+                        scope.row.CanGeneratedSubejctCount === 0 ||
+                        Number(scope.row.PlanSubjectCount) * 2 >=
+                          scope.row.CanGeneratedSubejctCount
+                      "
                       :title="
                         $t(
                           'trials:grouptConsistencyAnalysis:button:RandomCreate'
@@ -901,6 +909,7 @@
               style="margin-top: 40px"
               :IsSelfAnalysis="IsSelfAnalysis"
               :changeNum="changeNum"
+              :other-info="RuleOtherInfo"
               @close="
                 () => {
                   ReaderRulesVisible2 = false;
@@ -952,6 +961,7 @@
       >
         <DoctorConsistentRuleSubjectTable
           :data="rowData"
+          :other-info="RuleOtherInfo"
           @close="
             () => {
               DoctorConsistentRuleSubjectTableVisible = false;
@@ -1177,6 +1187,7 @@ export default {
       btnLoading: false,
       rowData: {},
       OtherInfo: {},
+      RuleOtherInfo: {},
       title: null,
       SelectList: [],
       TaskConsistentRuleList: [],
@@ -1463,6 +1474,7 @@ export default {
         .then((res) => {
           if (res.OtherInfo) {
             this.ReaderRulesFormVisible = false;
+            this.RuleOtherInfo = res.OtherInfo;
           } else {
             this.ReaderRulesFormVisible = true;
           }
@@ -1515,6 +1527,7 @@ export default {
           .then((res) => {
             if (res.OtherInfo) {
               this.ReaderRulesFormVisible = false;
+              this.RuleOtherInfo = res.OtherInfo;
             } else {
               this.ReaderRulesFormVisible = true;
             }

src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue

@@ -1054,7 +1054,7 @@ export default {
         this.stack.studyId = dicomSeries.studyId
         this.stack.seriesNumber = dicomSeries.seriesNumber
         this.stack.imageIds = dicomSeries.imageIds
-        this.stack.currentImageIdIndex = dicomSeries.imageIdIndex && dicomSeries.imageIdIndex < dicomSeries.imageIds.length - 1 ? dicomSeries.imageIdIndex : 0
+        this.stack.currentImageIdIndex = dicomSeries.imageIdIndex && dicomSeries.imageIdIndex < dicomSeries.imageIds.length ? dicomSeries.imageIdIndex : 0
         this.stack.imageIdIndex = dicomSeries.imageIdIndex
         this.stack.firstImageLoading = true
         this.stack.visitTaskId = dicomSeries.visitTaskId

src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue

@@ -1247,7 +1247,8 @@ export default {
             store.dispatch('reading/setActiveSeries', series)
             store.dispatch('reading/setLastCanvasTaskId', series.visitTaskId)
           }
-          this.$refs[`dicomCanvas${index}`][0].loadImageStack(series)
+          const s = Object.assign({}, series)
+          this.$refs[`dicomCanvas${index}`][0].loadImageStack(s)
 
           if (this.activeTool) {
             if (series.isCurrentTask && series.readingTaskState < 2) {
@@ -1270,7 +1271,8 @@ export default {
       this.canvasObj[this.currentDicomCanvasIndex] = dicomSeries
       this.$nextTick(() => {
         this.activeSeries = dicomSeries
-        this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].loadImageStack(dicomSeries).then(res => {
+        const s = Object.assign({}, dicomSeries)
+        this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].loadImageStack(s).then(res => {
           if (this.activeTool) {
             if (dicomSeries.isCurrentTask && dicomSeries.readingTaskState < 2) {
               this.$nextTick(() => {
@@ -1331,7 +1333,8 @@ export default {
       // }
       this.$nextTick(() => {
         this.activeSeries = dicomSeries
-        this.$refs[`dicomCanvas${canvasIndex}`][0].loadImageStack(dicomSeries)
+        const s = Object.assign({}, dicomSeries)
+        this.$refs[`dicomCanvas${canvasIndex}`][0].loadImageStack(s)
 
         store.dispatch('reading/setActiveSeries', dicomSeries)
         if (this.currentDicomCanvasIndex === this.maxCanvas - 1) {
@@ -1406,7 +1409,8 @@ export default {
         var promiseArr = []
         for (let i = 0; i < this.maxCanvas && i < seriesStack.length; i++) {
           this.canvasObj[i] = seriesStack[i]
-          promiseArr.push(this.$refs[`dicomCanvas${i}`][0].loadImageStack(seriesStack[i]))
+          const s = Object.assign({}, seriesStack[i])
+          promiseArr.push(this.$refs[`dicomCanvas${i}`][0].loadImageStack(s))
         }
         Promise.all(promiseArr).then(() => {
           // this.activateDicomCanvas(this.currentDicomCanvasIndex)
@@ -1509,12 +1513,14 @@ export default {
 
         for (let i = 0; i < this.maxCanvas; i++) {
           if (i === this.maxCanvas - 1) {
-            loadImagePromises.push(this.$refs[`dicomCanvas${i}`][0].loadImageStack(currentAddSeries))
+            const s = Object.assign({}, currentAddSeries)
+            loadImagePromises.push(this.$refs[`dicomCanvas${i}`][0].loadImageStack(s))
             this.currentDicomCanvasIndex = i
             this.activeSeries = currentAddSeries
             store.dispatch('reading/setActiveSeries', currentAddSeries)
           } else {
-            loadImagePromises.push(this.$refs[`dicomCanvas${i}`][0].loadImageStack(firstAddSeries))
+            const s = Object.assign({}, firstAddSeries)
+            loadImagePromises.push(this.$refs[`dicomCanvas${i}`][0].loadImageStack(s))
           }
         }
         Promise.all(loadImagePromises)

src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue

@@ -589,15 +589,15 @@ export default {
         }
       }
     },
-    split(rowId, questionId) {
+    async split(rowId, questionId) {
       const loading = this.$loading({ fullscreen: true })
-      var params = {
-        visitTaskId: this.visitTaskId,
-        questionId: questionId,
-        rowId: rowId
-      }
-      splitLesion(params).then(async res => {
-        loading.close()
+      try {
+        var params = {
+          visitTaskId: this.visitTaskId,
+          questionId: questionId,
+          rowId: rowId
+        }
+        await splitLesion(params)
         await this.getReadingQuestionAndAnswer()
         this.$nextTick(() => {
           this.tableQuestions.forEach(item => {
@@ -607,7 +607,11 @@ export default {
             })
           })
         })
-      })
+        loading.close()
+      } catch (e) {
+        loading.close()
+        console.log(e)
+      }
     },
     isCanActiveTool(toolName) {
       console.log('isCanActiveTool')

src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue

@@ -673,17 +673,16 @@ export default {
         }
       }
     },
-    split(rowId, questionId) {
+    async split(rowId, questionId) {
       const loading = this.$loading({ fullscreen: true })
-      var params = {
-        visitTaskId: this.visitTaskId,
-        questionId: questionId,
-        rowId: rowId
-      }
-      splitLesion(params).then(async res => {
-        loading.close()
+      try {
+        var params = {
+          visitTaskId: this.visitTaskId,
+          questionId: questionId,
+          rowId: rowId
+        }
+        await splitLesion(params)
         await this.getReadingQuestionAndAnswer()
-        DicomEvent.$emit('readingPageUpdate', {})
         this.$nextTick(() => {
           this.tableQuestions.forEach(item => {
             item.TableQuestions.Answers.forEach(i => {
@@ -692,7 +691,11 @@ export default {
             })
           })
         })
-      })
+        loading.close()
+      } catch (e) {
+        loading.close()
+        console.log(e)
+      }
     },
     // 融合
     async handleMerge(answers, questionId, orderMark) {

src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue

@@ -75,6 +75,16 @@ import { mapGetters } from 'vuex'
 import * as dicomParser from 'dicom-parser'
 import * as cornerstone from 'cornerstone-core'
 import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'
+var config = {
+  maxWebWorkers: 4,
+  startWebWorkersOnDemand: true,
+  taskConfiguration: {
+    decodeTask: {
+      initializeCodecsOnStartup: false
+    }
+  }
+}
+cornerstoneWADOImageLoader.webWorkerManager.initialize(config)
 cornerstoneWADOImageLoader.external.dicomParser = dicomParser
 cornerstoneWADOImageLoader.external.cornerstone = cornerstone
 const maximumSizeInBytes = 1024 * 1024 * 1024 * 6

src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue

@@ -516,15 +516,15 @@ export default {
         }
       }
     },
-    split(rowId, questionId) {
+    async split(rowId, questionId) {
       const loading = this.$loading({ fullscreen: true })
-      var params = {
-        visitTaskId: this.visitTaskId,
-        questionId: questionId,
-        rowId: rowId
-      }
-      splitLesion(params).then(async res => {
-        loading.close()
+      try {
+        var params = {
+          visitTaskId: this.visitTaskId,
+          questionId: questionId,
+          rowId: rowId
+        }
+        await splitLesion(params)
         await this.getReadingQuestionAndAnswer()
         this.$nextTick(() => {
           this.tableQuestions.forEach(item => {
@@ -534,7 +534,11 @@ export default {
             })
           })
         })
-      })
+        loading.close()
+      } catch (e) {
+        loading.close()
+        console.log(e)
+      }
     },
     isCanActiveTool(toolName) {
       this.getUnSaveTarget()

src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionList.vue

@@ -517,18 +517,16 @@ export default {
           questionId: questionId,
           rowId: rowId
         }
-        const res = await splitLesion(params)
-        if (res.IsSuccess) {
-          await this.getReadingQuestionAndAnswer()
-          this.$nextTick(() => {
-            this.tableQuestions.forEach(item => {
-              item.TableQuestions.Answers.forEach(i => {
-                var refName = `${item.Id}_${i.RowIndex}`
-                this.$refs[refName] && this.$refs[refName][0].initForm()
-              })
+        await splitLesion(params)
+        await this.getReadingQuestionAndAnswer()
+        this.$nextTick(() => {
+          this.tableQuestions.forEach(item => {
+            item.TableQuestions.Answers.forEach(i => {
+              var refName = `${item.Id}_${i.RowIndex}`
+              this.$refs[refName] && this.$refs[refName][0].initForm()
             })
           })
-        }
+        })
         loading.close()
       } catch (e) {
         loading.close()

src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue

@@ -1038,7 +1038,7 @@ export default {
         this.stack.studyId = dicomSeries.studyId
         this.stack.seriesNumber = dicomSeries.seriesNumber
         this.stack.imageIds = dicomSeries.imageIds
-        this.stack.currentImageIdIndex = dicomSeries.imageIdIndex && dicomSeries.imageIdIndex < dicomSeries.imageIds.length - 1 ? dicomSeries.imageIdIndex : 0
+        this.stack.currentImageIdIndex = dicomSeries.imageIdIndex && dicomSeries.imageIdIndex < dicomSeries.imageIds.length ? dicomSeries.imageIdIndex : 0
         this.stack.imageIdIndex = dicomSeries.imageIdIndex
         this.stack.firstImageLoading = true
         this.stack.visitTaskId = dicomSeries.visitTaskId

src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue

@@ -1335,7 +1335,8 @@ export default {
             store.dispatch('reading/setActiveSeries', series)
             store.dispatch('reading/setLastCanvasTaskId', series.visitTaskId)
           }
-          this.$refs[`dicomCanvas${index}`][0].loadImageStack(series)
+          let s = Object.assign({}, series)
+          this.$refs[`dicomCanvas${index}`][0].loadImageStack(s)
 
           if (this.activeTool) {
             if (series.isCurrentTask && series.readingTaskState < 2) {
@@ -1379,9 +1380,10 @@ export default {
       }
       this.$nextTick(() => {
         this.activeSeries = dicomSeries
+        let s = Object.assign({}, dicomSeries)
         this.$refs[
           `dicomCanvas${this.currentDicomCanvasIndex}`
-        ][0].loadImageStack(dicomSeries)
+        ][0].loadImageStack(s)
         // this.$refs['measurementList'].initPage(dicomSeries)
         store.dispatch('reading/setActiveSeries', dicomSeries)
         if (this.currentDicomCanvasIndex === this.maxCanvas - 1) {
@@ -1414,7 +1416,8 @@ export default {
       }
       this.$nextTick(() => {
         this.activeSeries = dicomSeries
-        this.$refs[`dicomCanvas${canvasIndex}`][0].loadImageStack(dicomSeries)
+        let s = Object.assign({}, dicomSeries)
+        this.$refs[`dicomCanvas${canvasIndex}`][0].loadImageStack(s)
 
         store.dispatch('reading/setActiveSeries', dicomSeries)
         if (this.currentDicomCanvasIndex === this.maxCanvas - 1) {
@@ -1517,8 +1520,9 @@ export default {
         var promiseArr = []
         for (let i = 0; i < this.maxCanvas && i < seriesStack.length; i++) {
           this.canvasObj[i] = seriesStack[i]
+          let s = Object.assign({}, seriesStack[i])
           promiseArr.push(
-            this.$refs[`dicomCanvas${i}`][0].loadImageStack(seriesStack[i])
+            this.$refs[`dicomCanvas${i}`][0].loadImageStack(s)
           )
         }
         Promise.all(promiseArr)
@@ -1638,15 +1642,17 @@ export default {
 
       for (let i = 0; i < this.maxCanvas; i++) {
         if (i === this.maxCanvas - 1) {
+          let s = Object.assign({}, currentAddSeries)
           loadImagePromises.push(
-            this.$refs[`dicomCanvas${i}`][0].loadImageStack(currentAddSeries)
+            this.$refs[`dicomCanvas${i}`][0].loadImageStack(s)
           )
           this.currentDicomCanvasIndex = i
           this.activeSeries = currentAddSeries
           store.dispatch('reading/setActiveSeries', currentAddSeries)
         } else {
+          let s = Object.assign({}, firstAddSeries)
           loadImagePromises.push(
-            this.$refs[`dicomCanvas${i}`][0].loadImageStack(firstAddSeries)
+            this.$refs[`dicomCanvas${i}`][0].loadImageStack(s)
           )
         }
       }

src/views/trials/trials-panel/reading/dicoms/customize/CustomizeMeasurementList.vue

@@ -3,10 +3,6 @@
 
     <div class="container" :style="{'height':height+'px'}" style="padding-bottom: 50px;overflow-y: auto;">
       <div class="basic-info">
-        <h3 v-if="isReadingShowSubjectInfo">
-          <span v-if="subjectCode">{{ subjectCode }} </span>
-          <span style="margin-left:5px;">{{ taskBlindName }}</span>
-        </h3>
         <div v-if="readingTaskState < 2">
           <el-tooltip class="item" effect="dark" :content="$t('trials:dicomReading:message:confirmReset')" placement="bottom">
             <i
@@ -15,6 +11,10 @@
             />
           </el-tooltip>
         </div>
+        <h3 v-if="isReadingShowSubjectInfo">
+          <span v-if="subjectCode">{{ subjectCode }} </span>
+          <span style="margin-left:5px;">{{ taskBlindName }}</span>
+        </h3>
       </div>
       <QuestionsPreview
         ref="QuestionsPreview"
@@ -465,6 +465,7 @@ export default {
       display: flex;
       justify-content: space-between;
       align-items: center;
+      flex-direction: row-reverse;
       h3{
         color: #ddd;
         padding: 5px 0px;

src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReadPage.vue

@@ -77,6 +77,16 @@ import { mapGetters } from "vuex";
 import * as dicomParser from 'dicom-parser'
 import * as cornerstone from 'cornerstone-core'
 import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'
+var config = {
+  maxWebWorkers: 4,
+  startWebWorkersOnDemand: true,
+  taskConfiguration: {
+    decodeTask: {
+      initializeCodecsOnStartup: false
+    }
+  }
+}
+cornerstoneWADOImageLoader.webWorkerManager.initialize(config)
 cornerstoneWADOImageLoader.external.dicomParser = dicomParser
 cornerstoneWADOImageLoader.external.cornerstone = cornerstone
 const maximumSizeInBytes = 1024 * 1024 * 1024 * 6

src/views/trials/trials-panel/reading/mim-medical-audit/components/AdReview.vue

@@ -1,14 +1,15 @@
 <template>
   <div class="ad_review_wrapper">
-    <div style="text-align:left">
-      <el-button v-if="auditInfo.IsExistsClinicalData" type="text" @click="previewCD">
-        {{ $t('trials:adReview:title:clinicalData') }}
+    <div style="text-align: left">
+      <el-button
+        v-if="auditInfo.IsExistsClinicalData"
+        type="text"
+        @click="previewCD"
+      >
+        {{ $t("trials:adReview:title:clinicalData") }}
       </el-button>
     </div>
-    <el-table
-      :data="adInfo.VisitInfoList"
-      style="width: 100%"
-    >
+    <el-table :data="adInfo.VisitInfoList" style="width: 100%">
       <!-- 访视名称 -->
       <el-table-column
         prop="VisitName"
@@ -28,7 +29,7 @@
       >
         <template>
           <el-table-column
-            v-for="(qs,i) in j.judgeQuestionList"
+            v-for="(qs, i) in j.judgeQuestionList"
             :key="i"
             prop=""
             :label="qs"
@@ -36,28 +37,83 @@
             width="150"
           >
             <template slot-scope="scope">
-              <div v-if="scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].QuestionType===1">
-                <span v-if="scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].DictionaryCode">{{ $fd(scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].DictionaryCode, parseInt(scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].Answer )) }}</span>
-                <span v-else>{{ scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].Answer }}</span>
+              <div
+                v-if="
+                  scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i]
+                    .QuestionType === 1
+                "
+              >
+                <span
+                  v-if="
+                    scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i]
+                      .DictionaryCode
+                  "
+                  >{{
+                    $fd(
+                      scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i]
+                        .DictionaryCode,
+                      parseInt(
+                        scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[
+                          i
+                        ].Answer
+                      )
+                    )
+                  }}</span
+                >
+                <span v-else>{{
+                  scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i]
+                    .Answer
+                }}</span>
               </div>
-              <div v-else-if="scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].QuestionType===2">
-                <div v-if="scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].Answer">
-                  <span>{{ $fd('YesOrNo', scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].Answer ) }}</span>
+              <div
+                v-else-if="
+                  scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i]
+                    .QuestionType === 2
+                "
+              >
+                <div
+                  v-if="
+                    scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i]
+                      .Answer
+                  "
+                >
+                  <span>{{
+                    $fd(
+                      "YesOrNo",
+                      scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i]
+                        .Answer
+                    )
+                  }}</span>
                   <!-- 查看详情 -->
                   <el-button
                     type="text"
-                    style="margin-left:5px;"
-                    @click="handleViewDetail(scope.row.VisitTaskInfoList[j.index].GlobalVisitTaskId)"
+                    style="margin-left: 5px"
+                    @click="
+                      handleViewDetail(
+                        scope.row.VisitTaskInfoList[j.index].GlobalVisitTaskId
+                      )
+                    "
                   >
-                    {{ $t('trials:adReview:table:view') }}
+                    {{ $t("trials:adReview:table:view") }}
                   </el-button>
                 </div>
 
                 <div v-else>
-                  {{ $fd('YesOrNo', scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].Answer ) }}
+                  {{
+                    $fd(
+                      "YesOrNo",
+                      scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i]
+                        .Answer
+                    )
+                  }}
                 </div>
               </div>
-              <div v-else>{{ scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].Answer }}</div>
+              <div v-else>
+                {{
+                  scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i]
+                    .Answer
+                }}
+              </div>
             </template>
           </el-table-column>
         </template>
@@ -73,7 +129,7 @@
           <el-button
             type="text"
             :title="$t('trials:adReview:table:viewR1')"
-            @click="handleView(scope.row,1)"
+            @click="handleView(scope.row, 1)"
           >
             R1
           </el-button>
@@ -81,18 +137,18 @@
           <el-button
             type="text"
             :title="$t('trials:adReview:table:viewR2')"
-            @click="handleView(scope.row,2)"
+            @click="handleView(scope.row, 2)"
           >
             R2
           </el-button>
         </template>
       </el-table-column>
     </el-table>
-    <h3>{{ $t('trials:adReview:title:adResult') }}</h3>
+    <h3>{{ $t("trials:adReview:title:adResult") }}</h3>
     <el-form
       ref="adForm"
       :model="adForm"
-      style="width:800px"
+      style="width: 800px"
       label-width="100"
     >
       <!-- 选择阅片人 -->
@@ -100,16 +156,13 @@
         :label="$t('trials:adReview:title:choseReader')"
         prop="judgeResultTaskId"
       >
-        <el-radio-group
-          v-model="adForm.judgeResultTaskId"
-          disabled
-        >
+        <el-radio-group v-model="adForm.judgeResultTaskId" disabled>
           <el-radio
             v-for="t in visitTaskArmList"
             :key="t.VisitTaskId"
             :label="t.VisitTaskId"
           >
-            {{ $fd('ArmEnum', t.ArmEnum) }}
+            {{ $fd("ArmEnum", t.ArmEnum) }}
           </el-radio>
         </el-radio-group>
       </el-form-item>
@@ -121,14 +174,12 @@
         <el-input
           v-model="adForm.judgeResultRemark"
           type="textarea"
-          :autosize="{ minRows: 4, maxRows: 6}"
+          :autosize="{ minRows: 4, maxRows: 6 }"
           disabled
         />
       </el-form-item>
       <!-- 截图说明 -->
-      <el-form-item
-        :label="$t('trials:adReview:title:screenShot')"
-      >
+      <el-form-item :label="$t('trials:adReview:title:screenShot')">
         <el-upload
           action=".png,.jpg,.jpeg"
           list-type="picture-card"
@@ -137,30 +188,41 @@
           class="disabled"
         >
           <i slot="default" class="el-icon-plus" />
-          <div slot="file" slot-scope="{file}">
-            <viewer :ref="file.url" :images="images">
-                <img
-                  class="el-upload-list__item-thumbnail"
-                  :src="OSSclientConfig.basePath + file.url"
-                  alt=""
-                  crossorigin="anonymous"
+          <div
+            slot="file"
+            slot-scope="{ file }"
+            style="width: 100%; height: 100%"
+          >
+            <viewer
+              :ref="file.url"
+              :images="images"
+              style="
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                width: 100%;
+                height: 100%;
+              "
+            >
+              <img
+                class="el-upload-list__item-thumbnail"
+                :src="OSSclientConfig.basePath + file.url"
+                alt=""
+                crossorigin="anonymous"
+                style="max-width: 100%; max-height: 100%"
+              />
+              <span class="el-upload-list__item-actions">
+                <span
+                  class="el-upload-list__item-preview"
+                  @click="handlePictureCardPreview(file)"
                 >
-                <span class="el-upload-list__item-actions">
-                  <span
-                    class="el-upload-list__item-preview"
-                    @click="handlePictureCardPreview(file)"
-                  >
-                    <i class="el-icon-zoom-in" />
-                  </span>
+                  <i class="el-icon-zoom-in" />
                 </span>
-              </viewer>
+              </span>
+            </viewer>
           </div>
         </el-upload>
-        <el-dialog
-          append-to-body
-          :visible.sync="imgVisible"
-          width="600px"
-        >
+        <el-dialog append-to-body :visible.sync="imgVisible" width="600px">
           <!-- <img width="100%" :src="imageUrl" alt="图片未找到"> -->
           <el-image :src="imageUrl" width="100%" crossorigin="anonymous">
             <!-- <div slot="placeholder" class="image-slot">
@@ -173,138 +235,166 @@
   </div>
 </template>
 <script>
-import { getToken } from '@/utils/auth'
+import { getToken } from "@/utils/auth";
 export default {
-  name: 'AReview',
+  name: "AReview",
   props: {
     auditInfo: {
       type: Object,
       default() {
-        return {}
-      }
+        return {};
+      },
     },
     rowData: {
       type: Object,
       default() {
-        return {}
-      }
-    }
+        return {};
+      },
+    },
   },
   data() {
     return {
       adInfo: {},
       adForm: {},
       imgVisible: false,
-      imageUrl: '',
+      imageUrl: "",
       fileList: [],
       visitTaskArmList: [],
       judgeQuestion: [],
-      isFixed: false
-    }
+      isFixed: false,
+    };
   },
   mounted() {
-    this.initPage()
+    this.initPage();
   },
   methods: {
     initPage() {
-      var JudgeInfo = this.auditInfo.JudgeInfo
-      var judgeQS = []
+      var JudgeInfo = this.auditInfo.JudgeInfo;
+      var judgeQS = [];
       if (JudgeInfo.VisitInfoList.length > 0) {
         JudgeInfo.VisitInfoList[0].VisitTaskInfoList.map((v, index) => {
-          var qsObj = { armEnum: v.ArmEnum, judgeQuestionList: [], index: index }
-          v.JudgeQuestionList.map(q => {
+          var qsObj = {
+            armEnum: v.ArmEnum,
+            judgeQuestionList: [],
+            index: index,
+          };
+          v.JudgeQuestionList.map((q) => {
             if (q.QuestionType === 1) {
-              qsObj.judgeQuestionList.push(q.QuestionName)
+              qsObj.judgeQuestionList.push(q.QuestionName);
             } else {
-              qsObj.judgeQuestionList.push(this.$fd('JudgeReadingQuestionType', q.QuestionType))
+              qsObj.judgeQuestionList.push(
+                this.$fd("JudgeReadingQuestionType", q.QuestionType)
+              );
             }
-          })
-          judgeQS.push(qsObj)
-        })
+          });
+          judgeQS.push(qsObj);
+        });
       }
-      this.judgeQuestion = judgeQS
-      this.isFixed = this.judgeQuestion.length > 0 && this.judgeQuestion[0].judgeQuestionList.length > 4
+      this.judgeQuestion = judgeQS;
+      this.isFixed =
+        this.judgeQuestion.length > 0 &&
+        this.judgeQuestion[0].judgeQuestionList.length > 4;
 
-      this.adInfo = JudgeInfo
-      this.adForm.judgeResultTaskId = JudgeInfo.JudgeResultTaskId
+      this.adInfo = JudgeInfo;
+      this.adForm.judgeResultTaskId = JudgeInfo.JudgeResultTaskId;
 
-      this.adForm.judgeResultRemark = JudgeInfo.JudgeResultRemark
-      this.fileList = []
+      this.adForm.judgeResultRemark = JudgeInfo.JudgeResultRemark;
+      this.fileList = [];
       if (JudgeInfo.JudgeResultImagePathList) {
-        JudgeInfo.JudgeResultImagePathList.map(url => {
-          if (url) { this.fileList.push({ name: '', url: url }) }
-        })
-        this.adForm.judgeResultImagePathList = JudgeInfo.JudgeResultImagePathList
+        JudgeInfo.JudgeResultImagePathList.map((url) => {
+          if (url) {
+            this.fileList.push({ name: "", url: url });
+          }
+        });
+        this.adForm.judgeResultImagePathList =
+          JudgeInfo.JudgeResultImagePathList;
       }
-      this.visitTaskArmList = JudgeInfo.VisitTaskArmList
+      this.visitTaskArmList = JudgeInfo.VisitTaskArmList;
     },
     handlePictureCardPreview(file) {
-      this.images = this.fileList.map(f => this.OSSclientConfig.basePath + f.url)
-      this.$refs[file.url].$viewer.show()
+      this.images = this.fileList.map(
+        (f) => this.OSSclientConfig.basePath + f.url
+      );
+      this.$refs[file.url].$viewer.show();
     },
     handleViewDetail(visitTaskId) {
-      console.log(this.rowData)
-      var trialId = this.$route.query.trialId
-      var token = getToken()
-      var criterionType = this.rowData.CriterionType
-      var readingTool = this.rowData.ReadingTool
-      readingTool = isNaN(parseInt(readingTool)) ? null : parseInt(readingTool)
-      var isReadingTaskViewInOrder = this.rowData.IsReadingTaskViewInOrder
-      var trialReadingCriterionId = this.rowData.TrialReadingCriterionId
+      console.log(this.rowData);
+      var trialId = this.$route.query.trialId;
+      var token = getToken();
+      var criterionType = this.rowData.CriterionType;
+      var readingTool = this.rowData.ReadingTool;
+      readingTool = isNaN(parseInt(readingTool)) ? null : parseInt(readingTool);
+      var isReadingTaskViewInOrder = this.rowData.IsReadingTaskViewInOrder;
+      var trialReadingCriterionId = this.rowData.TrialReadingCriterionId;
 
-      var path = ''
+      var path = "";
       if (readingTool === 0) {
-        path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${this.rowData.SubjectCode}&subjectId=${this.rowData.SubjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`
+        path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${
+          this.rowData.SubjectCode
+        }&subjectId=${
+          this.rowData.SubjectId
+        }&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`;
       } else {
-        path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${this.rowData.SubjectCode}&subjectId=${this.rowData.SubjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`
+        path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${
+          this.rowData.SubjectCode
+        }&subjectId=${
+          this.rowData.SubjectId
+        }&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`;
       }
-      var routeData = this.$router.resolve({ path })
-      window.open(routeData.href, '_blank')
+      var routeData = this.$router.resolve({ path });
+      window.open(routeData.href, "_blank");
     },
     handleView(row, armEnum) {
-      var task = row.VisitTaskInfoList.find(item => item.ArmEnum === armEnum)
-      var trialId = this.$route.query.trialId
-      var token = getToken()
-      var criterionType = this.rowData.CriterionType
-      var readingTool = this.rowData.ReadingTool
-      readingTool = isNaN(parseInt(readingTool)) ? null : parseInt(readingTool)
-      var isReadingTaskViewInOrder = this.rowData.IsReadingTaskViewInOrder
-      var trialReadingCriterionId = this.rowData.TrialReadingCriterionId
+      var task = row.VisitTaskInfoList.find((item) => item.ArmEnum === armEnum);
+      var trialId = this.$route.query.trialId;
+      var token = getToken();
+      var criterionType = this.rowData.CriterionType;
+      var readingTool = this.rowData.ReadingTool;
+      readingTool = isNaN(parseInt(readingTool)) ? null : parseInt(readingTool);
+      var isReadingTaskViewInOrder = this.rowData.IsReadingTaskViewInOrder;
+      var trialReadingCriterionId = this.rowData.TrialReadingCriterionId;
 
-      var path = ''
+      var path = "";
       if (readingTool === 0) {
-        path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${this.rowData.SubjectCode}&subjectId=${this.rowData.SubjectId}&visitTaskId=${task.VisitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`
+        path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${
+          this.rowData.SubjectCode
+        }&subjectId=${this.rowData.SubjectId}&visitTaskId=${
+          task.VisitTaskId
+        }&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`;
       } else {
-        path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${this.rowData.SubjectCode}&subjectId=${this.rowData.SubjectId}&visitTaskId=${task.VisitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`
+        path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${
+          this.rowData.SubjectCode
+        }&subjectId=${this.rowData.SubjectId}&visitTaskId=${
+          task.VisitTaskId
+        }&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`;
       }
-      var routeData = this.$router.resolve({ path })
-      window.open(routeData.href, '_blank')
+      var routeData = this.$router.resolve({ path });
+      window.open(routeData.href, "_blank");
     },
     previewCD() {
-      var token = getToken()
-      var trialId = this.$route.query.trialId
+      var token = getToken();
+      var trialId = this.$route.query.trialId;
       const routeData = this.$router.resolve({
-        path: `/clinicalData?subjectId=${this.auditInfo.SubjectId}&trialId=${trialId}&visitTaskId=${this.auditInfo.VisitTaskId}&TokenKey=${token}`
-      })
-      window.open(routeData.href, '_blank')
-    }
-  }
-}
+        path: `/clinicalData?subjectId=${this.auditInfo.SubjectId}&trialId=${trialId}&visitTaskId=${this.auditInfo.VisitTaskId}&TokenKey=${token}`,
+      });
+      window.open(routeData.href, "_blank");
+    },
+  },
+};
 </script>
 <style lang="scss" scoped>
-.ad_review_wrapper{
-
-  .disabled{
+.ad_review_wrapper {
+  .disabled {
     /deep/ .el-upload--picture-card {
       display: none;
     }
   }
-  /deep/  .el-upload-list__item {
+  /deep/ .el-upload-list__item {
     transition: none !important;
   }
-  /deep/  .el-upload-list__item-thumbnail {
-      /* 图片在方框内显示长边 */
-      object-fit: scale-down !important;
+  /deep/ .el-upload-list__item-thumbnail {
+    /* 图片在方框内显示长边 */
+    object-fit: scale-down !important;
   }
 }
 </style>

src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue

@@ -1,6 +1,5 @@
 <template>
   <div class="conclusions">
-
     <el-form
       ref="conclusionsForm"
       v-loading="loading"
@@ -12,13 +11,15 @@
       <el-form-item
         :label="$t('trials:medicalFeedback:button:isQuestions')"
         prop="IsHaveQuestion"
-        :rules="[
-          { required: true, message: $t('common:ruleMessage:select')},
-        ]"
+        :rules="[{ required: true, message: $t('common:ruleMessage:select') }]"
       >
         <el-radio-group
           v-model="form.IsHaveQuestion"
-          :disabled="isSendMessage || auditState===2 || !hasPermi(['trials:trials-panel:reading:mim-medical-audit:edit'])"
+          :disabled="
+            isSendMessage ||
+            auditState === 2 ||
+            !hasPermi(['trials:trials-panel:reading:mim-medical-audit:edit'])
+          "
           @change="isHaveQuestionChange"
         >
           <el-radio
@@ -38,16 +39,18 @@
         maxlength="500"
         autosize
         show-word-limit
-        :rules="[
-          { required: true, message: $t('common:ruleMessage:specify')},
-        ]"
+        :rules="[{ required: true, message: $t('common:ruleMessage:specify') }]"
       >
         <el-input
           v-model="form.Questioning"
           type="textarea"
-          :autosize="{ minRows: 3, maxRows: 5}"
+          :autosize="{ minRows: 3, maxRows: 5 }"
           maxlength="500"
-          :disabled="isSendMessage || auditState===2 || !hasPermi(['trials:trials-panel:reading:mim-medical-audit:edit'])"
+          :disabled="
+            isSendMessage ||
+            auditState === 2 ||
+            !hasPermi(['trials:trials-panel:reading:mim-medical-audit:edit'])
+          "
         />
       </el-form-item>
       <!-- 审核建议 -->
@@ -55,13 +58,15 @@
         v-if="form.IsHaveQuestion === true"
         :label="$t('trials:medicalFeedback:title:auditAdviceEnum')"
         prop="AuditAdviceEnum"
-        :rules="[
-          { required: true, message: $t('common:ruleMessage:select')},
-        ]"
+        :rules="[{ required: true, message: $t('common:ruleMessage:select') }]"
       >
         <el-radio-group
           v-model="form.AuditAdviceEnum"
-          :disabled="isSendMessage || auditState===2 || !hasPermi(['trials:trials-panel:reading:mim-medical-audit:edit'])"
+          :disabled="
+            isSendMessage ||
+            auditState === 2 ||
+            !hasPermi(['trials:trials-panel:reading:mim-medical-audit:edit'])
+          "
         >
           <el-radio
             v-for="item of $d.AuditAdvice"
@@ -79,26 +84,44 @@
       >
         <el-upload
           :action="accept"
-          :class="{disabled:isSendMessage}"
+          :class="{ disabled: isSendMessage }"
           :on-preview="handlePictureCardPreview"
           :before-upload="handleBeforeUpload"
           :http-request="uploadScreenshot"
           list-type="picture-card"
           :on-remove="handleRemove"
           :file-list="fileList"
-
-          :disabled="isSendMessage || auditState===2 || !hasPermi(['trials:trials-panel:reading:mim-medical-audit:edit'])"
-          style="width:300px"
+          :disabled="
+            isSendMessage ||
+            auditState === 2 ||
+            !hasPermi(['trials:trials-panel:reading:mim-medical-audit:edit'])
+          "
+          style="width: 300px"
         >
           <i slot="default" class="el-icon-plus" />
-          <div slot="file" slot-scope="{file}">
-            <viewer :ref="file.url" :images="images">
+          <div
+            slot="file"
+            slot-scope="{ file }"
+            style="width: 100%; height: 100%"
+          >
+            <viewer
+              :ref="file.url"
+              :images="images"
+              style="
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                width: 100%;
+                height: 100%;
+              "
+            >
               <img
                 class="el-upload-list__item-thumbnail"
                 :src="OSSclientConfig.basePath + file.url"
                 crossOrigin="anonymous"
                 alt=""
-              >
+                style="max-width: 100%; max-height: 100%"
+              />
               <span class="el-upload-list__item-actions">
                 <span
                   class="el-upload-list__item-preview"
@@ -108,7 +131,7 @@
                 </span>
 
                 <span
-                  v-if="!isSendMessage && auditState!==2"
+                  v-if="!isSendMessage && auditState !== 2"
                   class="el-upload-list__item-delete"
                   @click="handleRemove(file)"
                 >
@@ -130,7 +153,6 @@
           </el-image>
         </el-dialog> -->
       </el-form-item>
-
     </el-form>
     <!-- <viewer v-if="imgVisible" :images="[imageUrl]" ref="viewer">
       <img :src="imageUrl"  crossorigin="anonymous" alt="">
@@ -140,7 +162,9 @@
       :visible.sync="chatVisible"
       :close-on-click-modal="false"
       width="800px"
-      :title="`${$t('trials:medicalFeedback:title:qaRecord')} (${subjectCode} ${taskBlindName})`"
+      :title="`${$t(
+        'trials:medicalFeedback:title:qaRecord'
+      )} (${subjectCode} ${taskBlindName})`"
       append-to-body
     >
       <ChatForm
@@ -170,260 +194,285 @@
   </div>
 </template>
 <script>
-import { saveMedicalReviewInfo } from '@/api/trials'
-import ChatForm from './ChatForm'
-import CloseQC from './CloseQC'
-import Viewer from 'v-viewer'
+import { saveMedicalReviewInfo } from "@/api/trials";
+import ChatForm from "./ChatForm";
+import CloseQC from "./CloseQC";
+import Viewer from "v-viewer";
 export default {
-  name: 'AuditConclusions',
+  name: "AuditConclusions",
   components: {
     ChatForm,
-    CloseQC
+    CloseQC,
   },
   props: {
     medicalReviewInfo: {
       type: Object,
       default() {
-        return {}
-      }
+        return {};
+      },
     },
     auditState: {
       type: Number,
-      required: true
+      required: true,
     },
     visitTaskId: {
       type: String,
-      required: true
+      required: true,
     },
     subjectCode: {
       type: String,
-      required: true
+      required: true,
     },
     taskBlindName: {
       type: String,
-      required: true
-    }
+      required: true,
+    },
   },
   data() {
     return {
       form: {
-        TaskMedicalReviewId: '',
+        TaskMedicalReviewId: "",
         IsHaveQuestion: null,
-        Questioning: '',
+        Questioning: "",
         AuditAdviceEnum: null,
-        FileList: []
+        FileList: [],
       },
 
       loading: false,
-      accept: '.png,.jpg,.jpeg',
+      accept: ".png,.jpg,.jpeg",
       imgVisible: false,
-      imageUrl: '',
+      imageUrl: "",
       uploadDisabled: false,
       fileList: [],
       chatVisible: false,
-      userTypeEnumInt: zzSessionStorage.getItem('userTypeEnumInt') * 1,
+      userTypeEnumInt: zzSessionStorage.getItem("userTypeEnumInt") * 1,
       isClosedDialog: false,
       isSendMessage: false,
       closeQuestionVisible: false,
-      images: []
-    }
+      images: [],
+    };
   },
   mounted() {
-    this.initializeViewer()
-    this.initForm()
+    this.initializeViewer();
+    this.initForm();
   },
   methods: {
     initForm() {
       if (Object.keys(this.medicalReviewInfo).length > 0) {
         for (const k in this.form) {
           if (this.medicalReviewInfo.hasOwnProperty(k)) {
-            this.form[k] = this.medicalReviewInfo[k]
+            this.form[k] = this.medicalReviewInfo[k];
           }
         }
-        this.fileList = []
+        this.fileList = [];
         if (this.form.FileList) {
-          this.form.FileList.map(file => {
-            this.fileList.push({ name: file.FileName, url: file.ImagePath })
-          })
+          this.form.FileList.map((file) => {
+            this.fileList.push({ name: file.FileName, url: file.ImagePath });
+          });
         }
-        this.isClosedDialog = this.medicalReviewInfo.IsClosedDialog
-        this.isSendMessage = this.medicalReviewInfo.IsSendMessage
+        this.isClosedDialog = this.medicalReviewInfo.IsClosedDialog;
+        this.isSendMessage = this.medicalReviewInfo.IsSendMessage;
       }
     },
     handleSave(isPrompt) {
       return new Promise((resolve, reject) => {
-        this.$refs['conclusionsForm'].validate((valid) => {
+        this.$refs["conclusionsForm"].validate((valid) => {
           if (!valid) {
-            reject()
+            reject();
           } else {
-            this.form.IsSendDialog = this.form.IsHaveQuestion
-            var files = []
-            this.fileList.map(file => {
-              files.push({ FileName: file.name, ImagePath: file.url })
-            })
-            this.form.FileList = files
-            saveMedicalReviewInfo(this.form).then(res => {
-              if (isPrompt) {
-                this.$message.success(this.$t('common:message:savedSuccessfully'))
-                this.$emit('getMedicalAuditList')
-              }
-              this.isSendMessage = this.form.IsHaveQuestion
-              resolve()
-            }).catch(() => {
-              reject()
-            })
+            this.form.IsSendDialog = this.form.IsHaveQuestion;
+            var files = [];
+            this.fileList.map((file) => {
+              files.push({ FileName: file.name, ImagePath: file.url });
+            });
+            this.form.FileList = files;
+            saveMedicalReviewInfo(this.form)
+              .then((res) => {
+                if (isPrompt) {
+                  this.$message.success(
+                    this.$t("common:message:savedSuccessfully")
+                  );
+                  this.$emit("getMedicalAuditList");
+                }
+                this.isSendMessage = this.form.IsHaveQuestion;
+                resolve();
+              })
+              .catch(() => {
+                reject();
+              });
           }
-        })
-      })
+        });
+      });
     },
     save() {
       return new Promise((resolve, reject) => {
-        this.$refs['conclusionsForm'].validate((valid) => {
+        this.$refs["conclusionsForm"].validate((valid) => {
           if (!valid) {
-            resolve(false)
+            resolve(false);
           } else {
-            this.loading = true
-            this.form.IsSendDialog = this.form.IsHaveQuestion
-            var files = []
-            this.fileList.map(file => {
-              files.push({ FileName: file.name, ImagePath: file.url })
-            })
-            this.form.FileList = files
-            saveMedicalReviewInfo(this.form).then(res => {
-              this.$emit('getMedicalAuditList')
-              this.isSendMessage = this.form.IsHaveQuestion
-              this.loading = false
-              resolve(true)
-            }).catch(() => {
-              this.loading = false
-              reject()
-            })
+            this.loading = true;
+            this.form.IsSendDialog = this.form.IsHaveQuestion;
+            var files = [];
+            this.fileList.map((file) => {
+              files.push({ FileName: file.name, ImagePath: file.url });
+            });
+            this.form.FileList = files;
+            saveMedicalReviewInfo(this.form)
+              .then((res) => {
+                this.$emit("getMedicalAuditList");
+                this.isSendMessage = this.form.IsHaveQuestion;
+                this.loading = false;
+                resolve(true);
+              })
+              .catch(() => {
+                this.loading = false;
+                reject();
+              });
           }
-        })
-      })
+        });
+      });
     },
     validForm() {
       return new Promise((resolve) => {
-        this.$refs['conclusionsForm'].validate((valid) => {
-          resolve(valid)
-        })
-      })
+        this.$refs["conclusionsForm"].validate((valid) => {
+          resolve(valid);
+        });
+      });
     },
     handleReply() {
-      this.chatVisible = true
+      this.chatVisible = true;
     },
     handleCloseReply() {
-      this.closeQuestionVisible = true
+      this.closeQuestionVisible = true;
     },
     isHaveQuestionChange(val) {
-      this.$emit('setIsHaveQuestion', val)
+      this.$emit("setIsHaveQuestion", val);
     },
     refresh() {
-      this.isClosedDialog = true
-      this.$emit('getMedicalAuditList')
-      this.$refs['chatForm'].getMessageList()
-      this.$emit('handleSign')
+      this.isClosedDialog = true;
+      this.$emit("getMedicalAuditList");
+      this.$refs["chatForm"].getMessageList();
+      this.$emit("handleSign");
     },
     convertBase64ToBlob(imageEditorBase64) {
-      var base64Arr = imageEditorBase64.split(',')
-      var imgtype = ''
-      var base64String = ''
+      var base64Arr = imageEditorBase64.split(",");
+      var imgtype = "";
+      var base64String = "";
       if (base64Arr.length > 1) {
         // 如果是图片base64，去掉头信息
-        base64String = base64Arr[1]
+        base64String = base64Arr[1];
         imgtype = base64Arr[0].substring(
-          base64Arr[0].indexOf(':') + 1,
-          base64Arr[0].indexOf(';')
-        )
+          base64Arr[0].indexOf(":") + 1,
+          base64Arr[0].indexOf(";")
+        );
       }
       // 将base64解码
-      var bytes = atob(base64String)
+      var bytes = atob(base64String);
       // var bytes = base64;
-      var bytesCode = new ArrayBuffer(bytes.length)
+      var bytesCode = new ArrayBuffer(bytes.length);
       // 转换为类型化数组
-      var byteArray = new Uint8Array(bytesCode)
+      var byteArray = new Uint8Array(bytesCode);
 
       // 将base64转换为ascii码
       for (var i = 0; i < bytes.length; i++) {
-        byteArray[i] = bytes.charCodeAt(i)
+        byteArray[i] = bytes.charCodeAt(i);
       }
 
       // 生成Blob对象（文件对象）
-      return new Blob([bytesCode], { type: imgtype })
+      return new Blob([bytesCode], { type: imgtype });
     },
     async uploadScreenshot(param) {
-      this.loading = true
+      this.loading = true;
       try {
-        var file = await this.fileToBlob(param.file)
-        var trialId = this.$route.query.trialId
-        const res = await this.OSSclient.put(`/${trialId}/MedicalReview/${param.file.name}`, file)
-        this.fileList.push({ name: param.file.name, url: this.$getObjectName(res.url) })
-        this.loading = false
+        var file = await this.fileToBlob(param.file);
+        var trialId = this.$route.query.trialId;
+        const res = await this.OSSclient.put(
+          `/${trialId}/MedicalReview/${param.file.name}`,
+          file
+        );
+        this.fileList.push({
+          name: param.file.name,
+          url: this.$getObjectName(res.url),
+        });
+        this.loading = false;
       } catch (e) {
-        console.log(e)
+        console.log(e);
       }
     },
     handleBeforeUpload(file) {
       // 检测文件类型是否符合要求
       if (this.checkFileSuffix(file.name)) {
-        return true
+        return true;
       } else {
-        var msg = this.$t('trials:medicalFeedback:message:format')
-        msg = msg.replace('xxx', this.accept)
-        this.$alert(msg)
-        return false
+        var msg = this.$t("trials:medicalFeedback:message:format");
+        msg = msg.replace("xxx", this.accept);
+        this.$alert(msg);
+        return false;
       }
     },
     checkFileSuffix(fileName) {
-      var index = fileName.lastIndexOf('.')
-      var suffix = fileName.substring(index + 1, fileName.length)
-      if (this.accept.toLocaleLowerCase().search(suffix.toLocaleLowerCase()) === -1) {
-        return false
+      var index = fileName.lastIndexOf(".");
+      var suffix = fileName.substring(index + 1, fileName.length);
+      if (
+        this.accept.toLocaleLowerCase().search(suffix.toLocaleLowerCase()) ===
+        -1
+      ) {
+        return false;
       } else {
-        return true
+        return true;
       }
     },
     // 预览图片
     handlePictureCardPreview(file) {
-      this.images = this.fileList.map(f => this.OSSclientConfig.basePath + f.url)
+      this.images = this.fileList.map(
+        (f) => this.OSSclientConfig.basePath + f.url
+      );
       // this.imageUrl = this.OSSclientConfig.basePath + file.url
-      this.$refs[file.url].$viewer.show()
+      this.$refs[file.url].$viewer.show();
     },
     // 删除图片
     handleRemove(file, fileList) {
-      var idx = this.fileList.findIndex(i => i.url === file.url)
-      if (idx === -1) return
-      this.fileList.splice(idx, 1)
+      var idx = this.fileList.findIndex((i) => i.url === file.url);
+      if (idx === -1) return;
+      this.fileList.splice(idx, 1);
     },
     initializeViewer() {
       Viewer.setDefaults({
-        toolbar: { zoomIn: true, zoomOut: true, rotateLeft: true, rotateRight: true, flipHorizontal: true, flipVertical: true }
-      })
-    }
-  }
-}
+        toolbar: {
+          zoomIn: true,
+          zoomOut: true,
+          rotateLeft: true,
+          rotateRight: true,
+          flipHorizontal: true,
+          flipVertical: true,
+        },
+      });
+    },
+  },
+};
 </script>
 <style lang="scss" scoped>
-.conclusions{
-  .disabled{
+.conclusions {
+  .disabled {
     /deep/ .el-upload--picture-card {
       display: none;
-
     }
   }
-  /deep/  .el-upload-list__item {
+  /deep/ .el-upload-list__item {
     transition: none !important;
-    width:140px;
+    width: 140px;
     height: 140px;
     margin: 0 10px 5px 0;
   }
-  /deep/  .el-upload-list__item-thumbnail {
-      /* 图片在方框内显示长边 */
-      object-fit: scale-down !important;
+  /deep/ .el-upload-list__item-thumbnail {
+    /* 图片在方框内显示长边 */
+    object-fit: scale-down !important;
   }
-  .el-radio-group,.el-textarea,.el-input,.el-select{
-    width:300px;
+  .el-radio-group,
+  .el-textarea,
+  .el-input,
+  .el-select {
+    width: 300px;
   }
-
 }
 </style>

src/views/trials/trials-panel/setting/attachment/components/attachmentForm.vue

@@ -48,7 +48,7 @@
               style="margin-left:10px;"
               class="el-upload__tip"
             >
-              ({{ $t('trials:attachment:message:pdf') }})
+              {{ $t('system:tip:file:pdf') }}
             </span>
           </el-upload>
         </div>

src/views/trials/trials-panel/setting/email-manage/index.vue

@@ -46,21 +46,7 @@
             :label="$t('trials:emailManageCfg:title:SMTPServerPort')"
             prop="EmailSMTPServerPort"
           >
-            <el-radio-group
-              v-model="form.EmailSMTPServerPort"
-              :disabled="!isEdit"
-            >
-              <el-radio
-                :label="465"
-              >
-                465
-              </el-radio>
-              <el-radio
-                :label="25"
-              >
-                25
-              </el-radio>
-            </el-radio-group>
+          <el-input v-model.number="form.EmailSMTPServerPort" type="number" :disabled="!isEdit" />
           </el-form-item>
           <el-form-item v-if="hasPermi(['trials:trials-panel:setting:email-manage:edit'])">
             <el-button v-if="isEdit" size="small" type="primary" @click="setTrialEmail">
@@ -134,7 +120,27 @@ export default {
         EmailFromName: [{ required: true, message: this.$t('common:ruleMessage:specify') }],
         EmailAuthorizationCode: [{ required: true, message: this.$t('common:ruleMessage:specify') }],
         EmailSMTPServerAddress: [{ required: true, message: this.$t('common:ruleMessage:specify') }],
-        EmailSMTPServerPort: [{ required: true, message: this.$t('common:ruleMessage:select') }]
+        EmailSMTPServerPort: [{ required: true, message: this.$t('common:ruleMessage:specify') },{
+            type: "number",
+            min: 1,
+            max: 65535,
+            message: this.$t("common:ruleMessage:portPattern"),
+            trigger: "blur",
+          },
+          {
+            validator: (rule, value, callback) => {
+              if (
+                value &&
+                (String(value).includes(".") ||
+                  new RegExp(/\D/g).test(String(value)))
+              ) {
+                callback(new Error(this.$t("common:ruleMessage:portPattern")));
+              } else {
+                callback();
+              }
+            },
+            trigger: "blur",
+          },]
       },
       NODE_ENV: process.env.NODE_ENV,
     }

src/views/trials/trials-panel/setting/personnel-manage/components/dicomForm.vue

@@ -161,7 +161,10 @@ export default {
     open(siteData, data = null, status = "add") {
       this.siteData = siteData;
       this.status = status;
-      if (data) {
+      Object.keys(this.form).forEach((key) => {
+        this.form[key] = null;
+      });
+      if (data && status === "edit") {
         Object.keys(this.form).forEach((key) => {
           this.form[key] = data[key];
         });

src/views/trials/trials-panel/setting/personnel-manage/components/site.vue

@@ -168,9 +168,20 @@
             <el-input v-model="form.TrialSiteCode" />
           </el-form-item>
           <!-- 中心名称 -->
-          <el-form-item :label="$t('trials:sitesList:table:siteName')" prop="TrialSiteName">
-            <el-autocomplete clearable class="inline-input" style="width: 100%" v-model="form.TrialSiteName"
-              :fetch-suggestions="querySearch" @select="handleSelect" placeholder=""></el-autocomplete>
+          <el-form-item
+            :label="$t('trials:sitesList:table:siteName')"
+            prop="TrialSiteName"
+          >
+            <el-autocomplete
+              clearable
+              class="inline-input"
+              style="width: 100%"
+              v-model="form.TrialSiteName"
+              :fetch-suggestions="querySearch"
+              @select="handleSelect"
+              placeholder=""
+              @change="handleChange"
+            ></el-autocomplete>
           </el-form-item>
           <!-- 中心别称 -->
           <el-form-item :label="$t('trials:sitesList:table:siteAliasName')" prop="TrialSiteAliasName">
@@ -417,9 +428,13 @@ export default {
       this.form.TrialSiteName = item.SiteName;
       this.form.TrialSiteAliasName = item.AliasName
         ? item.AliasName
-        : this.form.TrialSiteAliasName;
+        : item.SiteName;
       this.form.SiteId = item.SiteId;
     },
+    handleChange(v) {
+      if (v) return
+      this.form.TrialSiteAliasName = ''
+    },
     querySearch(queryString, cb) {
       var TrialSiteSelectList = this.TrialSiteSelectList;
       var results = queryString
@@ -446,8 +461,14 @@ export default {
         let res = await getTrialSiteSelectList();
         if (res.IsSuccess) {
           this.TrialSiteSelectList = res.Result.map((item) => {
+            let v = ''
+            if (this.$i18n.locale === 'zh' && item.AliasName) {
+              v = `（${item.AliasName}）`
+            } else if (this.$i18n.locale === 'en' && item.AliasName) {
+              v = `( ${item.AliasName} )`
+            }
             return {
-              value: item.SiteName + " " + item.AliasName,
+              value: `${item.SiteName} ${v}`,
               ...item,
             };
           });

src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalAdd.vue

@@ -144,9 +144,9 @@ export default {
           { min: 0, max: 50, message: `${this.$t('common:ruleMessage:maxLength')} 50`, trigger: 'blur' }
         ],
         UserTypeId: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] }],
-        Phone: [
-          { required: false, validator: checkPhone, trigger: ['blur'] }
-        ],
+        // Phone: [
+        //   { required: false, validator: checkPhone, trigger: ['blur'] }
+        // ],
         Email: [
           { required: true, validator: validateEmail, trigger: ['blur'] }
         ]

src/views/trials/trials-panel/setting/reading-unit/components/ArbitrationRules.vue

@@ -253,7 +253,7 @@
             v-if="QuestionList[index].QuestionGenre !== 3"
             style="margin-top: 20px"
           >
-            分组:
+            {{ $t("trials:adRules:title:group") }}
             <el-tag
               v-for="itemA of QuestionList[index].AnswerGroup2List"
               :key="itemA"

src/views/trials/trials-panel/setting/reading-unit/components/CriterionDictionaryConfig.vue

@@ -165,7 +165,7 @@ export default {
 </script>
 
 <style scoped>
-/deep/ .el-form-item__content{
+::v-deep .el-form-item__content{
   width: calc(100% - 110px);
 }
 </style>

src/views/trials/trials-panel/setting/reading-unit/components/QuestionsList.vue

@@ -336,7 +336,13 @@ export default {
       this.isLook = true
       this.rowData.ReadingQuestionCriterionTrialId = this.trialCriterionId
       this.rowData.ReadingCriterionPageId = this.readingCriterionPageId
-      this.addOrEdit.title = this.$t('trials:readingUnit:qsList:title:view')// '查看'
+      let title = ''
+      if (this.$i18n.locale === 'zh' && (row.QuestionName || row.GroupName)) {
+        title =`：${row.QuestionName ? row.QuestionName : row.GroupName}`
+      } else if (this.$i18n.locale === 'en' && (row.QuestionEnName || row.GroupEnName)) {
+        title =`: ${row.QuestionEnName ? row.QuestionEnName : row.GroupEnName}`
+      }
+      this.addOrEdit.title = `${this.$t('trials:readingUnit:qsList:title:view')} ${title} `// '查看'
       this.addOrEdit.visible = true
     },
     handleEdit(row) {

src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue

@@ -99,7 +99,7 @@
             hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
           "
           size="mini"
-          style="position: absolute; top: 0; right: -10px"
+          style="position: absolute; top: 0; right: -40px"
           @click.stop="handleCheckAllChange"
           type="success"
           >{{

src/views/trials/trials-panel/setting/reading-unit/components/TableQsList.vue

@@ -256,7 +256,13 @@ export default {
     handleLook(row) {
       this.rowData = { ...row }
       this.type = 'look'
-      this.addOrEdit.title = this.$t('trials:readingPeriod:button:view')
+      let title = ''
+      if (this.$i18n.locale === 'zh' && (row.QuestionName || row.GroupName)) {
+        title =`：${row.QuestionName ? row.QuestionName : row.GroupName}`
+      } else if (this.$i18n.locale === 'en' && (row.QuestionEnName || row.GroupEnName)) {
+        title =`: ${row.QuestionEnName ? row.QuestionEnName : row.GroupEnName}`
+      }
+      this.addOrEdit.title = `${this.$t('trials:readingPeriod:button:view')}${title}`
       this.addOrEdit.visible = true
     },
     handleDelete(row) {

src/views/trials/trials-panel/setting/trial-config/components/clinicalDataForm.vue

@@ -132,7 +132,7 @@
               class="el-upload__tip"
             >
               <!-- (必须是doc/docx格式) -->
-              {{ $t('trials:processCfg:title:docFormat') }}
+              {{ $t('system:tip:file:docx') }}
             </span>
           </el-upload>
         </div>

src/views/trials/trials-panel/setting/trial-config/components/dicomConfig.vue

@@ -34,32 +34,21 @@
           :label="$t('trials:dicomCfg:form:CalledAE')"
           prop="CalledAE"
         >
-          <el-input
-            v-model="form.CalledAE"
-            style="width: 80%"
-            :disabled="form.IsTrialPACSConfirmed && !isEdit"
-            clearable
-            maxlength="16"
-          />
+          <p class="form_p copyBox">
+            {{ form.CalledAE }}
+            <el-tooltip placement="right" effect="light" v-if="form.CalledAE">
+              <div slot="content">{{ $t("common:button:tip:copy") }}</div>
+              <i class="el-icon-document-copy" @click.stop="copyLink"></i>
+            </el-tooltip>
+          </p>
         </el-form-item>
         <!-- IP地址 -->
         <el-form-item :label="$t('trials:dicomCfg:form:Ip')" prop="Ip">
-          <el-input
-            v-model="form.Ip"
-            style="width: 80%"
-            :disabled="form.IsTrialPACSConfirmed && !isEdit"
-            clearable
-          />
+          <p class="form_p">{{ form.Ip }}</p>
         </el-form-item>
         <!-- 端口 -->
         <el-form-item :label="$t('trials:dicomCfg:form:Port')" prop="Port">
-          <el-input
-            v-model.number="form.Port"
-            type="number"
-            clearable
-            style="width: 80%"
-            :disabled="form.IsTrialPACSConfirmed && !isEdit"
-          />
+          <p class="form_p">{{ form.Port }}</p>
         </el-form-item>
         <!--状态-->
         <el-form-item
@@ -74,15 +63,15 @@
           >
             {{ $fd("DicomTest", form.IsTestOK) }}
           </el-tag>
-          <!-- 测试DICOM AE -->
+          <!-- 测试DICOM AE style="position: absolute; right: 100px; top: 0"-->
           <el-button
             v-if="
-              isEdit &&
               hasPermi(['trials:trials-panel:setting:trial-config:save']) &&
               form.IsPACSConnect
             "
+            style="margin-left: 10px"
             type="primary"
-            style="position: absolute; right: 100px; top: 0"
+            size="mini"
             @click.stop="testSCPServerConnect"
           >
             {{ $t("common:button:DicomTest") }}
@@ -266,6 +255,7 @@ import {
   addOrUpdateDicomAE,
   testSCPServerConnect,
   ConfigTrialPACSInfoConfirm,
+  getTrialPacsConfigInfo,
 } from "@/api/trials";
 import SignForm from "@/views/trials/components/newSignForm";
 import const_ from "@/const/sign-code";
@@ -300,7 +290,16 @@ export default {
             trigger: "blur",
           },
           {
-            pattern: /[a-zA-Z0-9]/,
+            validator: (rule, value, callback) => {
+              let reg = /[a-zA-Z0-9]/;
+              if (!reg.test(value) && value !== "") {
+                callback(
+                  new Error(this.$t("common:ruleMessage:CallingAEPattern"))
+                );
+              } else {
+                callback();
+              }
+            },
             message: this.$t("common:ruleMessage:CallingAEPattern"),
             trigger: "blur",
           },
@@ -376,9 +375,45 @@ export default {
       confirmData: [],
       confirmVisible: false,
       updateVisible: false,
+      defaultObj: {},
     };
   },
   methods: {
+    copyLink() {
+      this.$copyText(
+        `${this.$t("trials:dicomCfg:form:CalledAE")}: ${
+          this.form.CalledAE
+        }\n${this.$t("trials:dicomCfg:form:Ip")}: ${this.form.Ip}\n${this.$t(
+          "trials:dicomCfg:form:Port"
+        )}: ${this.form.Port}\n${this.$t(
+          "trials:dicomCfg:form:Description"
+        )}: ${this.$t("trials:dicomCfg:Description:message")}`
+      )
+        .then((res) => {
+          // 复制成功
+          this.$message.success(
+            this.$t("trials:researchRecord:message:copySuccessfully")
+          );
+        })
+        .catch(() => {
+          // 复制失败
+          this.$alert(this.$t("trials:researchRecord:message:copyFailed"));
+        });
+    },
+    // 获取默认值
+    async getTrialPacsConfigInfo() {
+      try {
+        let param = {
+          TrialId: this.$route.query.trialId,
+        };
+        let res = await getTrialPacsConfigInfo(param);
+        if (res.IsSuccess) {
+          this.defaultObj = res.Result;
+        }
+      } catch (err) {
+        console.log(err);
+      }
+    },
     changeConnect(val) {
       if (!val) {
         this.form.CalledAE = null;
@@ -386,10 +421,16 @@ export default {
         this.form.Port = null;
         this.form.Modality = null;
         this.form.IsTestOK = null;
+      } else {
+        this.form.CalledAE = this.defaultObj.TrialCalledAE;
+        this.form.Ip = this.defaultObj.Ip;
+        this.form.Port = this.defaultObj.Port;
+        this.testSCPServerConnect();
       }
     },
     initForm(res) {
       this.getInfo();
+      this.getTrialPacsConfigInfo();
     },
     // 取消配置更新
     confirmCancel() {
@@ -399,10 +440,15 @@ export default {
     // 测试dicomAE
     async testSCPServerConnect() {
       try {
-        let res = await this.addOrUpdateDicomAE();
-        if (!res) return;
+        let validate = await this.$refs.dicomConfigForm.validate();
+        if (!validate) return;
+        let data = {
+          CalledAE: this.form.CalledAE,
+          Ip: this.form.Ip,
+          Port: this.form.Port,
+        };
         this.loading = true;
-        let d = await testSCPServerConnect(res);
+        let d = await testSCPServerConnect(data);
         this.loading = false;
         if (d.IsSuccess) {
           this.form.IsTestOK = d.Result;
@@ -422,12 +468,13 @@ export default {
         let res = await getTrialDicomAE(data);
         this.loading = false;
         if (res.IsSuccess) {
+          res.Result = res.Result || {};
           this.form.IsPACSConnect = res.OtherInfo.IsPACSConnect;
           this.form.IsTrialPACSConfirmed = res.OtherInfo.IsTrialPACSConfirmed;
           if (!res.OtherInfo.IsTrialPACSConfirmed) {
             this.isEdit = true;
           }
-          this.form.IsTestOK = res.Result.IsTestOK;
+          this.form.IsTestOK = res.Result.IsTestOK || null;
           this.form.CalledAE = res.Result.CalledAE;
           this.form.Ip = res.Result.IP;
           this.form.Port = res.Result.Port;
@@ -460,7 +507,8 @@ export default {
         this.loading = false;
         if (res.IsSuccess) {
           // this.$emit("refresh");
-          return res.Result;
+          this.Id = res.Result;
+          return res.Result || res.IsSuccess;
         }
         return false;
       } catch (err) {
@@ -516,6 +564,10 @@ export default {
     handleConfirm() {
       this.$refs["dicomConfigForm"].validate(async (valid) => {
         if (!valid) return;
+        if (!this.form.IsTestOK && this.form.IsPACSConnect)
+          return this.$message.warning(
+            this.$t("trials:dicomCfg:message:IsTestNo")
+          );
         this.getConfigArr();
         this.confirmVisible = true;
       });
@@ -525,6 +577,10 @@ export default {
     handleUpdate() {
       this.$refs["dicomConfigForm"].validate(async (valid) => {
         if (!valid) return;
+        if (!this.form.IsTestOK && this.form.IsPACSConnect)
+          return this.$message.warning(
+            this.$t("trials:dicomCfg:message:IsTestNo")
+          );
         this.getConfigArr();
         this.updateVisible = true;
       });
@@ -566,4 +622,10 @@ export default {
 .fontColor {
   color: red;
 }
+.form_p {
+  margin: 0;
+}
+.copyBox {
+  cursor: pointer;
+}
 </style>

src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue

@@ -1311,7 +1311,9 @@ export default {
       //   ",",
       //   " | "
       // );
-      this.form.BodyPartTypeList = this.form.BodyPartTypes.split("|");
+      let BodyPartTypes = res.BodyPartTypes;
+      this.form.BodyPartTypes = "";
+      this.form.BodyPartTypeList = BodyPartTypes.split("|");
       let r = await this.getTrialBodyPartList();
       if (r) {
         var bodyPartTypes = this.form.BodyPartTypeList.map((i) => {

src/views/trials/trials-panel/subject/reading-period/components/AddOrEditCD.vue

@@ -38,8 +38,8 @@
           </el-button>
         </el-col>
       </el-form-item>
-      <!-- 数据内容 -->
-      <el-form-item :label="$t('trials:readingPeriod:cd:form:data')">
+      <!-- 数据内容:label="$t('trials:readingPeriod:cd:form:data')" -->
+      <el-form-item>
         <!-- 多文件上传 -->
         <form id="inputForm" ref="uploadForm">
           <div class="form-group">

src/views/trials/trials-panel/subject/reading-period/components/ClinicalData.vue

@@ -903,7 +903,7 @@ export default {
         },
         signInfo: signInfo,
       };
-      if ((this.type = "consistencyAnalysis")) {
+      if (this.type === "consistencyAnalysis") {
         params = {
           data: {
             consistentClinicalDataId: this.currentData.Id,

src/views/trials/trials-panel/trial-summary/audit-record/index.vue

@@ -439,7 +439,7 @@
               </template>
             </el-table-column>
           </el-table>
-          <div v-if="otherData.length > 0" style="margin-top: 20px;margin-bottom: 10px;">
+          <div v-if="otherData.length > 0 && otherData[0].Value" style="margin-top: 20px;margin-bottom: 10px;">
             <!-- 签名信息: -->
             {{$t('trials:auditRecord:title:signInfo')}}
           </div>
@@ -777,7 +777,7 @@
               </template>
             </el-table-column>
           </el-table>
-          <div v-if="otherData.length > 0" style="margin-top: 20px;margin-bottom: 10px;">
+          <div v-if="otherData.length > 0 && otherData[0].Value" style="margin-top: 20px;margin-bottom: 10px;">
             <!-- 签名信息: -->
             {{$t('trials:auditRecord:title:signInfo')}}
           </div>
@@ -821,39 +821,40 @@ import Pagination from '@/components/Pagination'
 import BaseContainer from '@/components/BaseContainer'
 import BaseModel from '@/components/BaseModel'
 import { getToken } from '@/utils/auth'
-
+const searchDataDefault = () => {
+  return {
+    SortField: 'CreateTime',
+    Asc: false,
+    PageIndex: 1,
+    PageSize: 20,
+    ModuleType: null,
+    BlindName: null,
+    TrialId: '',
+    TrialSiteId: null,
+    SubjectId: null,
+    SubjectInfo: null,
+    SubjectVisitId: null,
+    VisitPlanInfo: null,
+    OptType: null,
+    ChildrenType: null,
+    Reason: null,
+    IsSign: null,
+    StartTime: null,
+    EndTime: null,
+    Description: null,
+    OpByUserName: null,
+    BatchId: null,
+    TrialReadingCriterionId: null,
+    RoleName:null,
+    TaskName: '',
+    CreateUserRealName: ''
+  }
+}
 export default {
   components: { BaseContainer, Pagination, BaseModel },
   dicts: ['OptType', 'ModuleType', 'ChildrenType'],
   data() {
-    const searchDataDefault = () => {
-      return {
-        SortField: 'CreateTime',
-        Asc: false,
-        PageIndex: 1,
-        PageSize: 20,
-        ModuleType: null,
-        BlindName: null,
-        TrialId: this.$route.query.trialId,
-        TrialSiteId: null,
-        SubjectId: null,
-        SubjectInfo: null,
-        SubjectVisitId: null,
-        VisitPlanInfo: null,
-        OptType: null,
-        ChildrenType: null,
-        Reason: null,
-        IsSign: null,
-        StartTime: null,
-        EndTime: null,
-        Description: null,
-        OpByUserName: null,
-        BatchId: null,
-        TrialReadingCriterionId: null,
-        RoleName:null,
-        TaskName: null
-      }
-    }
+    
     return {
       isViewer: true,
       otherData:[],
@@ -1295,30 +1296,7 @@ export default {
       })
     },
     handleReset() {
-      this.searchData = Object.assign(this.searchData, {
-        SortField: '',
-        Asc: false,
-        PageIndex: 1,
-        PageSize: 20,
-        ModuleType: null,
-        BlindName: null,
-        TrialId: this.$route.query.trialId,
-        TrialSiteId: null,
-        SubjectId: null,
-        SubjectInfo: null,
-        SubjectVisitId: null,
-        VisitPlanInfo: null,
-        OptType: null,
-        ChildrenType: null,
-        Reason: null,
-        IsSign: null,
-        StartTime: null,
-        EndTime: null,
-        Description: null,
-        OpByUserName: null,
-        BatchId: null,
-        RoleName: null
-      })
+      this.searchData = searchDataDefault()
       this.timeList = []
       this.getList()
     },
@@ -1328,6 +1306,7 @@ export default {
     },
     getList() {
       this.loading = true
+      this.searchData.TrialId = this.$route.query.trialId
       getInspectionList(this.searchData).then((res) => {
         this.list = res.CurrentPageData
         // this.list = this.list.map(v => {

src/views/trials/trials-panel/trial-summary/image-inspect/components/view-study.vue

@@ -23,10 +23,10 @@
             style="width: 140px"
           >
             <el-option
-              v-for="item of $d.modalType"
+              v-for="item of $d.Modality"
               :key="item.id"
-              :label="item.label"
-              :value="item.label"
+              :label="item.value"
+              :value="item.value"
             >
             </el-option>
           </el-select>
@@ -38,9 +38,10 @@
           <el-date-picker
             v-model="dateValue"
             type="datetimerange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
+            :range-separator="$t('baseForm:daterange:rangeSeparator')"
+            :start-placeholder="$t('imageInspect:daterange:startPlaceholder')"
+            :end-placeholder="$t('imageInspect:daterange:endPlaceholder')"
+            value-format="yyyy-MM-dd HH:mm:ss"
             :default-time="['00:00:00', '23:59:59']"
           >
           </el-date-picker>
@@ -218,12 +219,8 @@ export default {
       });
       data.PatientId = this.Patient.PatientId;
       if (this.dateValue && this.dateValue[0] && this.dateValue[1]) {
-        data.EarliestStudyTime = this.$moment(this.dateValue[0]).format(
-          "YYYY-MM-DD HH:mm:ss"
-        );
-        data.LatestStudyTime = this.$moment(this.dateValue[1]).format(
-          "YYYY-MM-DD HH:mm:ss"
-        );
+        data.EarliestStudyTime = this.dateValue[0];
+        data.LatestStudyTime = this.dateValue[1];
       } else {
         data.EarliestStudyTime = null;
         data.LatestStudyTime = null;
@@ -260,7 +257,7 @@ export default {
     image(item) {
       let token = getToken();
       const routeData = this.$router.resolve({
-        path: `/showdicom?studyId=${item.SCPStudyId}&TokenKey=${token}&type=Study`,
+        path: `/showdicom?studyId=${item.SCPStudyId}&TokenKey=${token}&type=Patient`,
       });
       this.newWindow = window.open(routeData.href, "_blank");
     },

src/views/trials/trials-panel/trial-summary/image-inspect/index.vue

@@ -83,8 +83,9 @@
             v-model="datetimerange"
             type="datetimerange"
             :default-time="['00:00:00', '23:59:59']"
-            :start-placeholder="$t('trials:loginLog:table:beginTime')"
-            :end-placeholder="$t('trials:loginLog:table:endTime')"
+            :range-separator="$t('baseForm:daterange:rangeSeparator')"
+            :start-placeholder="$t('imageInspect:daterange:startPlaceholder')"
+            :end-placeholder="$t('imageInspect:daterange:endPlaceholder')"
             value-format="yyyy-MM-dd HH:mm:ss"
             @change="handleDatetimeChange"
           />
@@ -198,7 +199,7 @@
           sortable="custom"
         >
           <template slot-scope="scope">
-            {{ scope.row.TrialSiteCode }},{{ scope.row.TrialSiteAliasName }}
+            {{ scope.row.TrialSiteCode }}, {{ scope.row.TrialSiteAliasName }}
           </template>
         </el-table-column>
         <!--受试者ID-->

src/views/trials/trials-panel/trial-summary/trial-information/index.vue

@@ -1,6 +1,17 @@
 <template>
   <div class="trial-information">
-    <el-descriptions :column="2" border style="width: 1000px">
+    <el-descriptions
+      :column="2"
+      border
+      style="width: 1000px"
+      :labelStyle="{
+        whiteSpace: 'nowrap',
+      }"
+      :contentStyle="{
+        wordBreak: 'break-all',
+        whiteSpace: 'nowrap',
+      }"
+    >
       <el-descriptions-item :label="$t('trials:trials-list:form:trialId')">
         {{ trialInfo.TrialCode }}
         <el-tag
@@ -19,27 +30,39 @@
         :label="$t('trials:trials-list:form:experimentName')"
         :contentStyle="{ 'max-width': '300px' }"
       >
-        {{ trialInfo.ExperimentName }}
+        <div class="ell" :title="trialInfo.ExperimentName">
+          {{ trialInfo.ExperimentName }}
+        </div>
       </el-descriptions-item>
       <el-descriptions-item
         :label="$t('trials:trials-list:form:researchNumber')"
         :contentStyle="{ 'max-width': '300px' }"
       >
-        {{ trialInfo.ResearchProgramNo }}
+        <div class="ell" :title="trialInfo.ResearchProgramNo">
+          {{ trialInfo.ResearchProgramNo }}
+        </div>
       </el-descriptions-item>
 
       <el-descriptions-item :label="$t('trials:trials-list:form:researchUnit')">
-        {{ trialInfo.MainResearchUnit }}
+        <div class="ell" :title="trialInfo.MainResearchUnit">
+          {{ trialInfo.MainResearchUnit }}
+        </div>
       </el-descriptions-item>
       <el-descriptions-item :label="$t('trials:trials-list:form:pi')">
-        {{ trialInfo.HeadPI }}
+        <div class="ell" :title="trialInfo.HeadPI">
+          {{ trialInfo.HeadPI }}
+        </div>
       </el-descriptions-item>
 
       <el-descriptions-item :label="$t('trials:trials-list:form:sponsor')">
-        {{ trialInfo.Sponsor }}
+        <div class="ell" :title="trialInfo.Sponsor">
+          {{ trialInfo.Sponsor }}
+        </div>
       </el-descriptions-item>
       <el-descriptions-item :label="$t('trials:trials-list:form:cro')">
-        {{ trialInfo.CRO }}
+        <div class="ell" :title="trialInfo.CRO">
+          {{ trialInfo.CRO }}
+        </div>
       </el-descriptions-item>
 
       <el-descriptions-item
@@ -65,7 +88,9 @@
         }}{{ trialInfo.Indication }}
       </el-descriptions-item>
       <el-descriptions-item :label="$t('trials:trials-list:form:modality')">
-        {{ trialInfo.Modalitys }}
+        <div class="ell" :title="trialInfo.Modalitys">
+          {{ trialInfo.Modalitys }}
+        </div>
       </el-descriptions-item>
       <el-descriptions-item :label="$t('trials:trials-list:form:siteCount')">
         {{ trialInfo.PlanSiteCount }}
@@ -91,7 +116,9 @@
         :span="2"
         :label="$t('trials:trials-list:form:criterion')"
       >
-        {{ trialInfo.Criterion }}
+        <div class="ell" :title="trialInfo.Criterion">
+          {{ trialInfo.Criterion }}
+        </div>
       </el-descriptions-item>
       <!--      <el-descriptions-item :label="$t('trials:trials-list:form:reviewMode')">-->
       <!--        <span>{{$fd('ReadingType', trialInfo.ReadingType)}}</span>-->
@@ -124,6 +151,7 @@
       :value="trialInfo.UserFeedBackUnDealedCount || 0"
       :max="99"
       class="inBox"
+      v-hasPermi="['role:pm']"
     >
       <i class="el-icon-message" @click.stop="openFeedBack"></i>
     </el-badge>
@@ -179,6 +207,9 @@ export default {
           name: this.$route.query.researchProgramNo,
           trialId: this.trialId,
         },
+        callBack: () => {
+          this.initForm();
+        },
       });
     },
   },
@@ -195,4 +226,10 @@ export default {
   margin-top: 30px;
   cursor: pointer;
 }
+.ell {
+  width: 90%;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+}
 </style>

src/views/trials/trials-panel/visit/crc-question/index.vue

@@ -1,13 +1,18 @@
 <template>
-  <BaseContainer style="height:100%;">
+  <BaseContainer style="height: 100%">
     <!-- 搜索框 -->
     <template slot="search-container">
       <el-form :inline="true">
         <!-- 中心编号 -->
         <el-form-item :label="$t('trials:crcQuestion:table:siteId')">
-          <el-select v-model="searchData.TrialSiteId" clearable filterable style="width:120px;">
+          <el-select
+            v-model="searchData.TrialSiteId"
+            clearable
+            filterable
+            style="width: 120px"
+          >
             <el-option
-              v-for="(item,index) of siteOptions"
+              v-for="(item, index) of siteOptions"
               :key="index"
               :label="item.TrialSiteCode"
               :value="item.TrialSiteId"
@@ -16,13 +21,16 @@
         </el-form-item>
         <!-- 受试者编号 -->
         <el-form-item :label="$t('trials:crcQuestion:table:subjectId')">
-          <el-input v-model="searchData.SubjectCode" style="width:100px;" />
+          <el-input v-model="searchData.SubjectCode" style="width: 100px" />
         </el-form-item>
         <!-- 访视名称 -->
-        <el-form-item class="my_multiple" :label="$t('trials:crcQuestion:table:visitName')">
+        <el-form-item
+          class="my_multiple"
+          :label="$t('trials:crcQuestion:table:visitName')"
+        >
           <el-select
             v-model="searchData.VisitPlanArray"
-            style="width:140px"
+            style="width: 140px"
             clearable
             multiple
           >
@@ -34,39 +42,70 @@
             >
               <span style="float: left">{{ item.VisitName }}</span>
             </el-option>
-            <el-option
-              key="Other"
-              label="Out of Plan"
-              value="1.11"
-            />
+            <el-option key="Other" label="Out of Plan" value="1.11" />
           </el-select>
         </el-form-item>
         <!-- 是否超限 -->
         <el-form-item :label="$t('trials:crcQuestion:table:isOverTime')">
-          <el-select v-model="searchData.IsOverTime" clearable style="width:120px">
-            <el-option v-for="item of $d.YesOrNo" :value="item.value" :label="item.label" :key="item.id"/>
+          <el-select
+            v-model="searchData.IsOverTime"
+            clearable
+            style="width: 120px"
+          >
+            <el-option
+              v-for="item of $d.YesOrNo"
+              :value="item.value"
+              :label="item.label"
+              :key="item.id"
+            />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('trials:crcQuestion:table:isClose')">
-          <el-select v-model="searchData.IsClosed" clearable style="width:120px">
-            <el-option v-for="item of $d.YesOrNo" :value="item.value" :label="item.label" :key="item.id"/>
+          <el-select
+            v-model="searchData.IsClosed"
+            clearable
+            style="width: 120px"
+          >
+            <el-option
+              v-for="item of $d.YesOrNo"
+              :value="item.value"
+              :label="item.label"
+              :key="item.id"
+            />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('trials:crcQuestion:table:reuploadSatus')">
-          <el-select v-model="searchData.ReuploadEnum" clearable style="width:120px">
-            <el-option v-for="item of $d.ReuploadEnum" :value="item.value" :label="item.label" :key="item.id"/>
+          <el-select
+            v-model="searchData.ReuploadEnum"
+            clearable
+            style="width: 120px"
+          >
+            <el-option
+              v-for="item of $d.ReuploadEnum"
+              :value="item.value"
+              :label="item.label"
+              :key="item.id"
+            />
           </el-select>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" @click="handleSearch">
-            {{ $t('common:button:search') }}
+            {{ $t("common:button:search") }}
           </el-button>
-          <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
-            {{ $t('common:button:reset') }}
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
+            {{ $t("common:button:reset") }}
           </el-button>
           <!--导出-->
-          <el-button type="primary" icon="el-icon-download" @click="handleExport">
-            {{ $t('common:button:export') }}
+          <el-button
+            type="primary"
+            icon="el-icon-download"
+            @click="handleExport"
+          >
+            {{ $t("common:button:export") }}
           </el-button>
         </el-form-item>
       </el-form>
@@ -76,7 +115,7 @@
     <template slot="main-container">
       <el-table
         v-loading="loading"
-        v-adaptive="{bottomOffset:60}"
+        v-adaptive="{ bottomOffset: 60 }"
         :data="list"
         stripe
         height="100"
@@ -93,7 +132,7 @@
           <template slot-scope="scope">
             <el-button
               type="text"
-              :style="{color:scope.row.IsClosed?'':'red'}"
+              :style="{ color: scope.row.IsClosed ? '' : 'red' }"
               @click="handleReplay(scope.row)"
             >
               {{ scope.row.ChallengeCode }}
@@ -132,16 +171,23 @@
           sortable="custom"
         >
           <template slot-scope="scope">
-
             <div v-if="otherInfo.QCProcessEnum === 1">
               <!-- {{ scope.row.CurrentQCEnum === 1?'审核':'--' }} -->
-              <el-tag v-if="scope.row.CurrentQCEnum === 1" type="primary">{{ $fd('CurrentQCType', 0) }}</el-tag>
+              <el-tag v-if="scope.row.CurrentQCEnum === 1" type="primary">{{
+                $fd("CurrentQCType", 0)
+              }}</el-tag>
               <span v-else>--</span>
             </div>
             <div v-else-if="otherInfo.QCProcessEnum === 2">
               <!-- {{ scope.row.CurrentQCEnum === 1?'初审':scope.row.CurrentQCEnum === 2?'复审':'--' }} -->
-              <el-tag v-if="scope.row.CurrentQCEnum === 1" type="primary">{{ $fd('CurrentQCType', scope.row.CurrentQCEnum) }}</el-tag>
-              <el-tag v-else-if="scope.row.CurrentQCEnum === 2" type="warning">{{ $fd('CurrentQCType', scope.row.CurrentQCEnum) }}</el-tag>
+              <el-tag v-if="scope.row.CurrentQCEnum === 1" type="primary">{{
+                $fd("CurrentQCType", scope.row.CurrentQCEnum)
+              }}</el-tag>
+              <el-tag
+                v-else-if="scope.row.CurrentQCEnum === 2"
+                type="warning"
+                >{{ $fd("CurrentQCType", scope.row.CurrentQCEnum) }}</el-tag
+              >
               <span v-else>--</span>
             </div>
           </template>
@@ -170,8 +216,10 @@
           width="140"
         >
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.IsOverTime" type="danger">{{ $fd('YesOrNo', scope.row.IsOverTime) }}</el-tag>
-            <el-tag v-else>{{ $fd('YesOrNo', scope.row.IsOverTime) }}</el-tag>
+            <el-tag v-if="scope.row.IsOverTime" type="danger">{{
+              $fd("YesOrNo", scope.row.IsOverTime)
+            }}</el-tag>
+            <el-tag v-else>{{ $fd("YesOrNo", scope.row.IsOverTime) }}</el-tag>
           </template>
         </el-table-column>
         <!-- 最新回复时间 -->
@@ -191,8 +239,12 @@
           sortable="custom"
         >
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.IsClosed">{{ $fd('YesOrNo', scope.row.IsClosed) }}</el-tag>
-            <el-tag v-else type="danger">{{ $fd('YesOrNo', scope.row.IsClosed) }}</el-tag>
+            <el-tag v-if="scope.row.IsClosed">{{
+              $fd("YesOrNo", scope.row.IsClosed)
+            }}</el-tag>
+            <el-tag v-else type="danger">{{
+              $fd("YesOrNo", scope.row.IsClosed)
+            }}</el-tag>
           </template>
         </el-table-column>
         <!-- 关闭时间 -->
@@ -213,9 +265,15 @@
         >
           <template slot-scope="scope">
             <span v-if="scope.row.ReuploadEnum === 0">--</span>
-            <el-tag v-else-if="scope.row.ReuploadEnum === 1" type="danger">{{ $fd('ReuploadEnum', scope.row.ReuploadEnum) }}</el-tag>
-            <el-tag v-else-if="scope.row.ReuploadEnum === 2" type="warning">{{ $fd('ReuploadEnum', scope.row.ReuploadEnum) }}</el-tag>
-            <el-tag v-else-if="scope.row.ReuploadEnum === 3" type="primary">{{ $fd('ReuploadEnum', scope.row.ReuploadEnum) }}</el-tag>
+            <el-tag v-else-if="scope.row.ReuploadEnum === 1" type="danger">{{
+              $fd("ReuploadEnum", scope.row.ReuploadEnum)
+            }}</el-tag>
+            <el-tag v-else-if="scope.row.ReuploadEnum === 2" type="warning">{{
+              $fd("ReuploadEnum", scope.row.ReuploadEnum)
+            }}</el-tag>
+            <el-tag v-else-if="scope.row.ReuploadEnum === 3" type="primary">{{
+              $fd("ReuploadEnum", scope.row.ReuploadEnum)
+            }}</el-tag>
           </template>
         </el-table-column>
         <!-- 重传完成时间 -->
@@ -247,7 +305,13 @@
       </el-table>
 
       <!-- 分页组件 -->
-      <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize" @pagination="getList" />
+      <pagination
+        class="page"
+        :total="total"
+        :page.sync="searchData.PageIndex"
+        :limit.sync="searchData.PageSize"
+        @pagination="getList"
+      />
     </template>
 
     <!-- 回复质疑 -->
@@ -255,32 +319,54 @@
       v-if="chatVisible"
       :visible.sync="chatVisible"
       :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :before-close="beforeClose"
       width="800px"
-      :title="$t('trials:crcQuestion:dialogTitle:message1') + `(${currentQCRow.SubjectCode} ${currentQCRow.VisitName})`"
+      :title="
+        $t('trials:crcQuestion:dialogTitle:message1') +
+        `(${currentQCRow.SubjectCode} ${currentQCRow.VisitName})`
+      "
     >
-      <chat-form ref="chatForm" :data="currentQCRow" user-type="crc" :body-parts="otherInfo.BodyPartTypes" :modalities="otherInfo.Modalitys" :subject-visit-id="currentQCRow.Id" :clinical-enum="otherInfo.ClinicalInformationTransmissionEnum" @close="close" @getDialogList="getDialogList" @getNextTask="getNextTask"/>
+      <chat-form
+        ref="chatForm"
+        :data="currentQCRow"
+        user-type="crc"
+        :body-parts="otherInfo.BodyPartTypes"
+        :modalities="otherInfo.Modalitys"
+        :subject-visit-id="currentQCRow.Id"
+        :clinical-enum="otherInfo.ClinicalInformationTransmissionEnum"
+        @close="beforeClose"
+        @getDialogList="getDialogList"
+        @getNextTask="getNextTask"
+      />
     </el-dialog>
   </BaseContainer>
 </template>
 <script>
-import { getCRCChallengeList, getTrialSiteSelect, getTrialVisitStageSelect, getQCChallengeDialogList, getNextCRCChallenge } from '@/api/trials'
-import { getQCChallengeList_Export } from '@/api/export'
-import ChatForm from './components/chatForm'
-import BaseContainer from '@/components/BaseContainer'
-import Pagination from '@/components/Pagination'
+import {
+  getCRCChallengeList,
+  getTrialSiteSelect,
+  getTrialVisitStageSelect,
+  getQCChallengeDialogList,
+  getNextCRCChallenge,
+} from "@/api/trials";
+import { getQCChallengeList_Export } from "@/api/export";
+import ChatForm from "./components/chatForm";
+import BaseContainer from "@/components/BaseContainer";
+import Pagination from "@/components/Pagination";
 const searchDataDefault = () => {
   return {
     IsOverTime: null,
-    SubjectCode: '',
-    TrialSiteId: '',
+    SubjectCode: "",
+    TrialSiteId: "",
     VisitPlanArray: [],
     IsClosed: null,
     PageIndex: 1,
-    PageSize: 20
-  }
-}
+    PageSize: 20,
+  };
+};
 export default {
-  name: 'CrcQusetion',
+  name: "CrcQusetion",
   components: { BaseContainer, Pagination, ChatForm },
   data() {
     return {
@@ -293,115 +379,144 @@ export default {
       siteOptions: [],
       visitPlanOptions: [],
       otherInfo: {},
-      trialId: this.$route.query.trialId
-    }
+      trialId: this.$route.query.trialId,
+    };
   },
   mounted() {
-    this.getList()
-    this.getSite()
-    this.getVisitPlanOptions()
+    this.getList();
+    this.getSite();
+    this.getVisitPlanOptions();
+  },
+  watch: {
+    chatVisible() {
+      if (!this.chatVisible) {
+        this.$store.state.trials.checkTaskId = null;
+      }
+    },
   },
   methods: {
+    beforeClose() {
+      this.chatVisible = false;
+      this.$store.state.trials.checkTaskId = null;
+    },
     handleExport() {
-      getQCChallengeList_Export(this.searchData).then(res => {
-      }).catch(() => { this.loading = false })
+      getQCChallengeList_Export(this.searchData)
+        .then((res) => {})
+        .catch(() => {
+          this.loading = false;
+        });
     },
     // 获取质疑列表
     getList() {
-      this.loading = true
-      this.searchData.TrialId = this.trialId
-      getCRCChallengeList(this.searchData).then(res => {
-        this.loading = false
-        this.list = res.Result.CurrentPageData
-        this.total = res.Result.TotalCount
-        this.otherInfo = res.OtherInfo
-      }).catch(() => { this.loading = false })
+      this.loading = true;
+      this.searchData.TrialId = this.trialId;
+      getCRCChallengeList(this.searchData)
+        .then((res) => {
+          this.loading = false;
+          this.list = res.Result.CurrentPageData;
+          this.total = res.Result.TotalCount;
+          this.otherInfo = res.OtherInfo;
+        })
+        .catch(() => {
+          this.loading = false;
+        });
     },
     // 回复质疑
     handleReplay(row) {
-      this.loading = true
-      getQCChallengeDialogList(row.Id).then(res => {
-        this.loading = false
-        if (res.IsSuccess) {
-          if (res.Result.length > 0) { Object.assign(row, res.Result[0]) }
-          this.currentQCRow = { ...row }
-          this.chatVisible = true
-        }
-      }).catch(() => { this.loading = false })
-    },
-    close() {
-      this.chatVisible = false
+      this.loading = true;
+      getQCChallengeDialogList(row.Id)
+        .then((res) => {
+          this.loading = false;
+          if (res.IsSuccess) {
+            if (res.Result.length > 0) {
+              Object.assign(row, res.Result[0]);
+            }
+            this.currentQCRow = { ...row };
+            this.$store.state.trials.checkTaskId = row.SubjectVisitId;
+            this.chatVisible = true;
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+        });
     },
     async getNextTask(qcChallengeId) {
       try {
         const params = {
           trialId: this.trialId,
-          qcChallengeId: qcChallengeId
-        }
-        const res = await getNextCRCChallenge(params)
+          qcChallengeId: qcChallengeId,
+        };
+        const res = await getNextCRCChallenge(params);
         if (res.IsSuccess) {
-          const res2 =  await getQCChallengeDialogList(res.Result.Id)
+          const res2 = await getQCChallengeDialogList(res.Result.Id);
           if (res2.IsSuccess) {
-            Object.assign(res.Result, res2.Result[0])
-            this.chatVisible = false
-            this.currentQCRow = res.Result
+            Object.assign(res.Result, res2.Result[0]);
+            this.chatVisible = false;
+            this.currentQCRow = res.Result;
             this.$nextTick(() => {
-              this.chatVisible = true
-            })
+              this.chatVisible = true;
+            });
           }
         }
       } catch (e) {
-        this.chatVisible = false
-        console.log(e)
+        this.chatVisible = false;
+        console.log(e);
       }
     },
     getDialogList() {
-      this.loading = true
-      getQCChallengeDialogList(this.currentQCRow.Id).then(res => {
-        this.loading = false
-        if (res.IsSuccess && res.Result.length > 0) {
-          var i = this.list.findIndex(item => item.Id === this.currentQCRow.Id)
-          if (i > -1) {
-            this.currentQCRow = Object.assign(this.list[i], res.Result[0])
-            this.$refs['chatForm'].addMessage(res.Result[0].DialogList[res.Result[0].DialogList.length - 1])
+      this.loading = true;
+      getQCChallengeDialogList(this.currentQCRow.Id)
+        .then((res) => {
+          this.loading = false;
+          if (res.IsSuccess && res.Result.length > 0) {
+            var i = this.list.findIndex(
+              (item) => item.Id === this.currentQCRow.Id
+            );
+            if (i > -1) {
+              this.currentQCRow = Object.assign(this.list[i], res.Result[0]);
+              this.$refs["chatForm"].addMessage(
+                res.Result[0].DialogList[res.Result[0].DialogList.length - 1]
+              );
+            }
           }
-        }
-      }).catch(() => { this.loading = false })
+        })
+        .catch(() => {
+          this.loading = false;
+        });
     },
     // 重置
     handleReset() {
-      this.searchData = searchDataDefault()
-      this.getList()
+      this.searchData = searchDataDefault();
+      this.getList();
     },
     // 查询
     handleSearch() {
-      this.searchData.PageIndex = 1
-      this.getList()
+      this.searchData.PageIndex = 1;
+      this.getList();
     },
     // 排序
     handleSortByColumn(column) {
-      if (column.order === 'ascending') {
-        this.searchData.Asc = true
+      if (column.order === "ascending") {
+        this.searchData.Asc = true;
       } else {
-        this.searchData.Asc = false
+        this.searchData.Asc = false;
       }
-      this.searchData.SortField = column.prop
-      this.searchData.PageIndex = 1
-      this.getList()
+      this.searchData.SortField = column.prop;
+      this.searchData.PageIndex = 1;
+      this.getList();
     },
     // 获取site下拉框数据
     getSite() {
-      getTrialSiteSelect(this.trialId).then(res => {
-        this.siteOptions = res.Result
-      })
+      getTrialSiteSelect(this.trialId).then((res) => {
+        this.siteOptions = res.Result;
+      });
     },
     // 获取访视下拉框数据
     getVisitPlanOptions() {
-      getTrialVisitStageSelect(this.trialId)
-        .then((res) => {
-          this.visitPlanOptions = res.Result
-        })
-    }
-  }
-}
+      getTrialVisitStageSelect(this.trialId).then((res) => {
+        this.visitPlanOptions = res.Result;
+      });
+    },
+  },
+};
 </script>

src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue

@@ -221,6 +221,7 @@
                 :disabled="btnLoading"
                 webkitdirectory
                 multiple
+                title=""
                 @change="beginScanFiles($event)"
               />
             </div>
@@ -572,13 +573,16 @@
         :label="$t('trials:uploadNonDicoms:tab:uploadPacs')"
         name="pacs"
         :disabled="btnLoading"
+        v-if="relationInfo.IsPacsConnectConfiged"
       >
         <uploadDicomPacs
           v-if="uploadActiveName === 'pacs'"
           ref="dicomPacs"
           :subjectVisitId="subjectVisitId"
+          :relationInfo="relationInfo"
           :subjectId="subjectId"
           @getList="getParentList"
+          @petDataTip="petDataTip"
         />
       </el-tab-pane>
     </el-tabs>
@@ -778,6 +782,16 @@ import {
 import * as dicomParser from "dicom-parser";
 import * as cornerstone from "cornerstone-core";
 import * as cornerstoneWADOImageLoader from "cornerstone-wado-image-loader";
+var config = {
+  maxWebWorkers: 4,
+  startWebWorkersOnDemand: true,
+  taskConfiguration: {
+    decodeTask: {
+      initializeCodecsOnStartup: false,
+    },
+  },
+};
+cornerstoneWADOImageLoader.webWorkerManager.initialize(config);
 cornerstoneWADOImageLoader.external.dicomParser = dicomParser;
 cornerstoneWADOImageLoader.external.cornerstone = cornerstone;
 import DicomPreview from "@/views/dicom-show/dicom-preview";
@@ -847,7 +861,7 @@ export default {
       uploadCount: 0,
       uploadedCount: 0,
       wsList: [],
-      relationInfo: null,
+      relationInfo: {},
       trialBodyPartTypes: [],
       trialModalitys: [],
       myInterval: [],
@@ -958,8 +972,8 @@ export default {
         });
     },
     // 弹框提示pet-ct临床数据未上传
-    petDataTip() {
-      if (this.confirmFlag) {
+    petDataTip(isPacs = false) {
+      if (this.confirmFlag || isPacs) {
         this.confirmFlag = false;
         this.$confirm(
           this.$t("trials:crc-upload:confirm:message"),
@@ -990,6 +1004,7 @@ export default {
     // 打开上传pet临床数据弹框
     handleUploadPetData(row) {
       this.studyData = row;
+      this.studyData.SubjectId = this.subjectId;
       this.petVisible = true;
     },
     // 预览所有影像
@@ -1021,7 +1036,7 @@ export default {
         for (var i = 0; i < files.length; ++i) {
           (function (index) {
             p = p.then(function () {
-              if (files[index].name.indexOf("DICOMDIR") === -1) {
+              if (files[index].name.toUpperCase().indexOf("DICOMDIR") === -1) {
                 validFilesCount = validFilesCount + 1;
                 return scope.parseDicomFile(files[index]);
               }
@@ -1049,6 +1064,8 @@ export default {
         reader.onload = function (e) {
           try {
             var data = dicomParser.parseDicom(new Uint8Array(e.target.result));
+            var instanceUid = data.string("x00080018");
+            if (!instanceUid) return resolve();
             var modality = data.string("x00080060") || "";
             var studyUid = data.string("x0020000d");
             var pixelDataElement = data.elements.x7fe00010;

src/views/trials/trials-panel/visit/crc-upload/components/uploadDiocmPacs.vue

@@ -229,6 +229,7 @@ import {
   getVisitPatientStudyFilterList,
   submitVisitStudyBinding,
   getDicomModalityList,
+  verifyPacsImage,
 } from "@/api/trials";
 import BaseContainer from "@/components/BaseContainer";
 import Pagination from "@/components/Pagination";
@@ -256,6 +257,12 @@ export default {
       type: String,
       required: true,
     },
+    relationInfo: {
+      required: true,
+      default: () => {
+        return {};
+      },
+    },
   },
   data() {
     return {
@@ -267,6 +274,9 @@ export default {
       datetimerange: [],
       tableSelectData: [],
       DicomModalityList: [],
+      SCPStudyIdList: [],
+      ReUploadSCPStudyIdList: [],
+      warningArr: [],
     };
   },
   created() {
@@ -274,6 +284,76 @@ export default {
     this.getDicomModalityList();
   },
   methods: {
+    // 校验上传数据
+    async verifyPacsImage(arr) {
+      try {
+        this.warningArr = [];
+        this.ReUploadSCPStudyIdList = [];
+        this.SCPStudyIdList = [];
+        let data = {
+          TrialId: this.$route.query.trialId,
+          SubjectVisitId: this.subjectVisitId,
+          SubjectId: this.subjectId,
+          ScpStudyIdList: arr,
+        };
+        this.loading = true;
+        let res = await verifyPacsImage(data);
+        if (res.IsSuccess) {
+          for (let i = 0; i < res.Result.length; i++) {
+            let item = res.Result[i];
+            if (item.AllowReUpload) {
+              this.ReUploadSCPStudyIdList.push(item.SCPStudyId);
+              continue;
+            }
+            if (item.AllowUpload) {
+              this.SCPStudyIdList.push(item.SCPStudyId);
+              continue;
+            }
+            if (!item.AllowUpload && !item.AllowReUpload) {
+              // let data = this.tableSelectData.find(
+              //   (d) => d.SCPStudyId === item.SCPStudyId
+              // );
+              // this.warningArr.push(Object.assign({}, data, item));
+              this.warningArr.push(item);
+              continue;
+            }
+          }
+          if (this.warningArr.length <= 0) {
+            this.submitVisitStudyBinding(
+              this.SCPStudyIdList,
+              this.ReUploadSCPStudyIdList
+            );
+          } else {
+            var li = this.warningArr.map((item) => {
+              return `<li>${item.ErrorMesseage}</li>`;
+            });
+            const content = `
+                        <div>
+                        <ol>
+                        ${li.join("")}
+                        </ol>
+                        </div>`;
+            this.$alert(
+              content,
+              this.$t("trials:uploadDicomList:label:prompt"),
+              {
+                confirmButtonText: this.$t(
+                  "trials:uploadDicomList:label:confirm"
+                ),
+                dangerouslyUseHTMLString: true,
+                callback: (action) => {},
+              }
+            );
+            this.loading = false;
+          }
+        } else {
+          this.loading = false;
+        }
+      } catch (err) {
+        this.loading = false;
+        console.log(err);
+      }
+    },
     // 获取检查技术列表
     async getDicomModalityList() {
       try {
@@ -294,25 +374,40 @@ export default {
           this.$t("trials:visit:crcUpload:uploadDicomPacs:message:notCheck")
         );
       let arr = this.tableSelectData.map((item) => item.SCPStudyId);
-      this.submitVisitStudyBinding(arr);
+      this.verifyPacsImage(arr);
     },
     handleAdd(row) {
       let arr = [row.SCPStudyId];
-      this.submitVisitStudyBinding(arr);
+      this.verifyPacsImage(arr);
     },
     // 添加检查
-    async submitVisitStudyBinding(arr) {
+    async submitVisitStudyBinding(ScpStudyIdList, ReUploadSCPStudyIdList) {
       try {
         let data = {
           TrialId: this.$route.query.trialId,
           SubjectVisitId: this.subjectVisitId,
           SubjectId: this.subjectId,
-          ScpStudyIdList: arr,
+          ScpStudyIdList,
+          ReUploadSCPStudyIdList,
         };
         this.loading = true;
         let res = await submitVisitStudyBinding(data);
         this.loading = false;
         if (res.IsSuccess) {
+          let arr = [...ScpStudyIdList, ...ReUploadSCPStudyIdList];
+          let tableSelectData = this.list.filter((item) =>
+            arr.includes(item.SCPStudyId)
+          );
+          let flag = tableSelectData.some((item) => {
+            return (
+              item.Modalities === "PET-CT" ||
+              item.Modalities === "CT、PT" ||
+              item.Modalities === "PT、CT"
+            );
+          });
+          if (flag && this.relationInfo.IsHaveStudyClinicalData) {
+            this.$emit("petDataTip", true);
+          }
           this.getList();
           this.$emit("getList");
         }

src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue

@@ -347,7 +347,7 @@
     </el-dialog>
 
     <!-- 上传非dicom视频文件 -->
-    <el-dialog
+    <!-- <el-dialog
       v-if="uploadVideoVisible"
       :visible.sync="uploadVideoVisible"
       upload-video-visible
@@ -358,7 +358,7 @@
       custom-class="base-dialog-wrapper"
     >
       <upload-videos @uploadOver="uploadOver" />
-    </el-dialog>
+    </el-dialog> -->
     <!-- 预览非DICOM视频文件 -->
     <el-dialog
       v-if="lookVideoVisible"
@@ -410,12 +410,12 @@
 import { preArchiveStudy, getNoneDicomStudyList, getNoneDicomStudyFileList, uploadNoneDicomFile, addOrUpdateNoneDicomStudy, deleteNoneDicomStudy, deleteNoneDicomStudyFile } from '@/api/trials'
 import { getToken } from '@/utils/auth'
 // import PreviewFiles from './previewFiles'
-import uploadVideos from '@/components/videos'
+// import uploadVideos from '@/components/videos'
 import moment from 'moment'
 import store from "@/store";
 export default {
   name: 'UploadNonDicomFiles',
-  components: { uploadVideos },
+  // components: { uploadVideos },
   props: {
     bodyParts: {
       type: String,

src/views/trials/trials-panel/visit/crc-upload/components/uploadPetClinicalData.vue

@@ -265,14 +265,44 @@
               {{ $t("trials:uploadClinicalData:button:downloadTemplate") }}
             </el-button>
             <!-- 新增 -->
-            <el-button
+            <!-- <el-button
               icon="el-icon-plus"
               type="primary"
               size="small"
               @click.native.prevent="addFile(cd.Id, cd.ClinicalDataTrialSetId)"
             >
               {{ $t("common:button:new") }}
+            </el-button> -->
+            <!-- 新增 -->
+            <el-button
+              icon="el-icon-plus"
+              type="primary"
+              size="small"
+              :disabled="btnLoading"
+              :loading="btnLoading"
+            >
+              {{ $t("common:button:new") }}
             </el-button>
+            <input
+              type="file"
+              name="file"
+              multiple
+              ref="addFile"
+              style="
+                position: absolute;
+                top: 0;
+                left: 0;
+                width: 100%;
+                height: 100%;
+                opacity: 0;
+                cursor: pointer;
+              "
+              :accept="faccept.join(',')"
+              @change="
+                ($event) =>
+                  beginScanFiles($event, cd.Id, cd.ClinicalDataTrialSetId)
+              "
+            />
           </div>
           <el-table :data="cd.PDFFileList" style="width: 100%" height="300">
             <el-table-column type="index" width="50" />
@@ -282,6 +312,20 @@
               :label="$t('trials:uploadClinicalData:table:fileName')"
               width="250"
             />
+            <!-- 文件大小 -->
+            <el-table-column
+              prop="Size"
+              :label="$t('trials:uploadClinicalData:table:fileSize')"
+              width="150"
+            >
+              <template slot-scope="scope">
+                <span>{{
+                  scope.row.Size && scope.row.Size > 0
+                    ? `${(scope.row.Size / 1024 / 1024).toFixed(2)}MB`
+                    : 0
+                }}</span>
+              </template>
+            </el-table-column>
             <!-- 上传时间 -->
             <el-table-column
               prop="CreateTime"
@@ -444,8 +488,9 @@ import {
   deletePreviousHistory,
   deletePreviousOther,
   deletePreviousSurgery,
+  getCRCClinicalData,
+  addOrUpdateReadingClinicalData,
 } from "@/api/trials";
-import { getCRCClinicalData } from "@/api/trials";
 import PreviousRadiotherapy from "./previousRadiotherapy";
 import PreviousSurgery from "./previousSurgery";
 import PreviousOther from "./previousOther";
@@ -492,9 +537,11 @@ export default {
   },
   data() {
     return {
+      faccept: [".pdf"],
       isShow: false,
       userTypeEnumInt: zzSessionStorage.getItem("userTypeEnumInt") * 1,
       loading: false,
+      btnLoading: false,
       PreviousHistoryList: [],
       PreviousSurgeryList: [],
       PreviousOtherList: [],
@@ -516,11 +563,100 @@ export default {
     this.getClinicalData();
   },
   methods: {
+    beginScanFiles(e, id, clinicalDataTrialSetId) {
+      this.currentRow = {
+        Id: id,
+        ClinicalDataTrialSetId: clinicalDataTrialSetId,
+        SubjectId: this.data.SubjectId,
+      };
+      this.currentRow.TrialId = this.$route.query.trialId;
+      var files = e.target.files;
+      this.fileList = [];
+      for (var i = 0; i < files.length; ++i) {
+        const fileName = files[i].name;
+        var extendName = fileName
+          .substring(fileName.lastIndexOf("."))
+          .toLocaleLowerCase();
+        if (this.faccept.indexOf(extendName) !== -1) {
+          let obj = {
+            size: files[i].size,
+            type: extendName.split(".")[1],
+            file: files[i],
+          };
+          this.fileList.push(obj);
+        }
+      }
+      this.handleUploadFile();
+      this.$refs.addFile.forEach((item) => {
+        item.value = null;
+      });
+    },
+    async handleUploadFile() {
+      this.btnLoading = true;
+      this.loading = true;
+      this.addFileList = [];
+      try {
+        for (var i = 0; i < this.fileList.length; ++i) {
+          const file = await this.fileToBlob(this.fileList[i].file);
+          var timestamp = Date.now();
+          const res = await this.OSSclient.put(
+            `/${this.trialId}/ClinicalData/${timestamp}_${this.fileList[i].file.name}`,
+            file
+          );
+          this.addFileList.push({
+            fileName: this.fileList[i].file.name,
+            path: this.$getObjectName(res.url),
+            url: this.$getObjectName(res.url),
+            type: this.fileList[i].type,
+            size: this.fileList[i].size,
+          });
+        }
+        this.saveClinicalData();
+      } catch (err) {
+        console.log(err);
+        this.btnLoading = false;
+        this.loading = false;
+      }
+    },
+    saveClinicalData() {
+      this.btnLoading = true;
+      this.loading = true;
+      var param = {
+        id: this.currentRow.Id,
+        trialId: this.currentRow.TrialId,
+        subjectId: this.currentRow.SubjectId,
+        readingId: this.subjectVisitId,
+        clinicalDataTrialSetId: this.currentRow.ClinicalDataTrialSetId,
+        isVisit: true,
+        deleteFileIds: [],
+        addFileList: this.addFileList,
+      };
+      if (this.studyData.StudyId) {
+        param.StudyId = this.studyData.StudyId;
+      }
+      addOrUpdateReadingClinicalData(param)
+        .then((response) => {
+          this.btnLoading = false;
+          this.loading = false;
+          // 刷新文件列表并关闭弹窗
+          this.getClinicalData();
+          this.$message.success(
+            this.$t("trials:uploadClinicalData:message:uploadSuccessfully")
+          );
+          this.$emit("getStudyInfo");
+        })
+        .catch(() => {
+          this.btnLoading = false;
+          this.loading = false;
+        });
+    },
     getClinicalData() {
       this.loading = true;
       this.data.TrialId = this.$route.query.trialId;
       var param = {
         StudyId: this.studyData.StudyId,
+        TrialId: this.$route.query.trialId,
+        SubjectId: this.studyData.SubjectId,
       };
       getCRCClinicalData(param)
         .then((res) => {

src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue

@@ -45,13 +45,13 @@
             <div style="text-align: right; position: relative">
               <div
                 class="uploadTip"
-                style="position: absolute; top: 0; left: 0"
+                style="position: absolute; top: 0; left: 10px"
               >
                 {{ $store.state.trials.uploadTip }}
               </div>
               <!-- 下载所有影像 -->
               <el-button
-                v-if="$store.state.trials.config.IsSupportQCDownloadImage"
+                v-if="$store.state.trials.config.IsSupportQCDownloadImage&&!hasPermi(['role:spm'])"
                 size="small"
                 type="primary"
                 style="margin-left: 10px"
@@ -303,13 +303,13 @@
             <div style="text-align: right; position: relative">
               <div
                 class="uploadTip"
-                style="position: absolute; top: 0; left: 0"
+                style="position: absolute; top: 0; left: 10px"
               >
                 {{ $store.state.trials.uploadTip }}
               </div>
               <!-- 下载所有影像 -->
               <el-button
-                v-if="$store.state.trials.config.IsSupportQCDownloadImage"
+                v-if="$store.state.trials.config.IsSupportQCDownloadImage&&!hasPermi(['role:spm'])"
                 size="small"
                 type="primary"
                 style="margin-left: 10px"

vue.config.js

@@ -82,20 +82,20 @@ module.exports = {
     },
     plugins: [
       new CopyPlugin([
-        { from: './node_modules/@cornerstonejs/codec-charls/dist/charlsjs.js', to: 'charlsjs.js' },
-        { from: './node_modules/@cornerstonejs/codec-charls/dist/charlsjs.js.mem', to: './static/js/charlsjs.js.mem' },
-        { from: './node_modules/@cornerstonejs/codec-charls/dist/charlswasm.js', to: './static/js/charlswasm.js' },
-        { from: './node_modules/@cornerstonejs/codec-charls/dist/charlswasm.wasm', to: './static/js/charlswasm.wasm' },
-        { from: './node_modules/@ffmpeg/core/dist/ffmpeg-core.js', to: 'ffmpeg-core.js' },
-        { from: './node_modules/@ffmpeg/core/dist/ffmpeg-core.wasm', to: 'ffmpeg-core.wasm' },
-        { from: './node_modules/@ffmpeg/core/dist/ffmpeg-core.worker.js', to: 'ffmpeg-core.worker.js' },
+        // { from: './node_modules/@cornerstonejs/codec-charls/dist/charlsjs.js', to: 'charlsjs.js' },
+        // { from: './node_modules/@cornerstonejs/codec-charls/dist/charlsjs.js.mem', to: './static/js/charlsjs.js.mem' },
+        // { from: './node_modules/@cornerstonejs/codec-charls/dist/charlswasm.js', to: './static/js/charlswasm.js' },
+        // { from: './node_modules/@cornerstonejs/codec-charls/dist/charlswasm.wasm', to: './static/js/charlswasm.wasm' },
+        // { from: './node_modules/@ffmpeg/core/dist/ffmpeg-core.js', to: 'ffmpeg-core.js' },
+        // { from: './node_modules/@ffmpeg/core/dist/ffmpeg-core.wasm', to: 'ffmpeg-core.wasm' },
+        // { from: './node_modules/@ffmpeg/core/dist/ffmpeg-core.worker.js', to: 'ffmpeg-core.worker.js' },
         {
           from: path.resolve(__dirname, './static'),
           to: path.resolve(__dirname, './dist/static'),
           ignore: ['.*']
         }
       ]),
-      process.env.NODE_ENV === 'development' || process.env.VUE_APP_OSS_CONFIG_BUCKET === 'zyypacs-usa' ? function() { }
+      process.env.NODE_ENV === 'development' || process.env.VUE_APP_OSS_CONFIG_BUCKET === 'zyypacs-usa' ? function () { }
         : new WebpackAliyunOss({
           from: ['./dist/**'],
           dist: process.env.VUE_APP_OSS_PATH + distDate,
@@ -124,7 +124,7 @@ module.exports = {
       // 生成文件的最大体积
       maxAssetSize: 3000000000,
       // 只给出js的性能提示
-      assetFilter: function(assetFileName) {
+      assetFilter: function (assetFileName) {
         return assetFileName.endsWith('.js')
       }
     },