.env.usa

@@ -2,7 +2,7 @@
 ENV = 'usa'
 NODE_ENV = 'usa'
 # base public path
-VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-07-19/'
+VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-07-17/'
 
 # 是否开启登陆限制 true:是 false:否
 VUE_APP_LOGIN_FOR_PERMISSION = true

.env.usa_prod

@@ -2,7 +2,7 @@
 ENV = 'usa'
 NODE_ENV = 'usa'
 # base public path
-VUE_APP_BASE_PATH = 'https://ei-med-s3-code.s3.amazonaws.com/2024-07-19/'
+VUE_APP_BASE_PATH = 'https://ei-med-s3-code.s3.amazonaws.com/2024-07-17/'
 
 # 是否开启登陆限制 true:是 false:否
 VUE_APP_LOGIN_FOR_PERMISSION = true

src/App.vue

@@ -89,7 +89,6 @@ import {
   batchAddOrUpdateFrontInternationalization,
   getFrontInternationalizationList,
 } from "@/api/dictionary/dictionary";
-import { getTrialExtralConfig } from "@/api/trials";
 import Vue from "vue";
 import i18n from "./lang";
 export default {
@@ -106,28 +105,6 @@ export default {
   mounted() {
     this.show = process.env.VUE_APP_OSS_PATH === "/test/dist";
   },
-  watch: {
-    "$route.query": {
-      async handler() {
-        if (
-          this.$route.query.trialId &&
-          this.$route.query.trialId !== this.$store.state.trials.config.trialId
-        ) {
-          let res = await getTrialExtralConfig({
-            TrialId: this.$route.query.trialId,
-          });
-          if (res.IsSuccess) {
-            this.$store.dispatch("trials/setConfig", {
-              trialId: this.$route.query.trialId,
-              ...res.Result,
-            });
-          }
-        }
-      },
-      immediate: true,
-      deep: true,
-    },
-  },
   methods: {
     changeValue(target, attr, e) {
       this.$set(target, attr, e);

src/api/reading.js

@@ -171,19 +171,3 @@ export function getCustomTag(param) {
     data: param
   })
 }
-
-export function clearSkipReadingCache(param) {
-  return request({
-    url: `/ReadingImageTask/clearSkipReadingCache`,
-    method: 'post',
-    data: param
-  })
-}
-
-export function setSkipReadingCache(param) {
-  return request({
-    url: `/ReadingImageTask/setSkipReadingCache`,
-    method: 'post',
-    data: param
-  })
-}

src/api/trials.js

@@ -3675,11 +3675,3 @@ export function getTrialSiteSelectList(params) {
     params
   })
 }
-// 获取项目配置
-export function getTrialExtralConfig(params) {
-  return request({
-    url: `/TrialConfig/getTrialExtralConfig`,
-    method: 'get',
-    params
-  })
-}

src/main.js

@@ -44,6 +44,7 @@ Viewer.setDefaults({
     'rotatable': true,
     'scalable': true,
     'transition': true,
+    'fullscreen': true,
     'keyboard': true,
     'url': 'data-source'
   }
@@ -367,9 +368,7 @@ async function VueInit() {
     }
     _vm.$store.dispatch('user/logout').then(res => {
       // window.location.href = `/login`
-      if(_vm.$msgbox){
       _vm.$msgbox.close();
-      }
       isOpen = false
       isLock = null
       zzSessionStorage.removeItem('isLock')

src/permission.js

@@ -12,7 +12,7 @@ NProgress.configure({ showSpinner: false })
 
 const whiteList = ['/ReviewersResearch', '/login', '/error', '/resetpassword', '/recompose', '/email-recompose', '/trialStats', '/showdicom', '/imagesShare', '/audit', '/preview', '/researchLogin', '/blindResumeInfo', '/trialsResume', '/joinVerify', '/showNoneDicoms', '/noneDicomReading', '/clinicalData', '/readingDicoms', '/readingPage', '/visitDicomReview', '/visitNondicomReview', '/globalReview', '/adReview', '/oncologyReview', '/nonedicoms']
 
-router.beforeEach(async (to, from, next) => {
+router.beforeEach(async(to, from, next) => {
   NProgress.start()
   // 设置页面标题
   // document.title = getPageTitle(to.meta.title)
@@ -56,7 +56,7 @@ router.beforeEach(async (to, from, next) => {
     /* has no token*/
     if (whiteList.indexOf(to.path) !== -1) {
       // 在免登录whiteList中，直接进入
-      if (to.path === '/readingDicoms' || to.path === '/noneDicomReading') {
+      if (to.path === '/readingDicoms' || to.path === '/noneDicomReading'){
         OSSclient()
       }
       next()

src/store/modules/reading.js

@@ -493,10 +493,11 @@ const actions = {
     })
   },
   removeCustomizeMeasuredData({ state }, obj) {
+    
     return new Promise(async resolve => {
       var index = state.visitTaskList.findIndex(i => i.VisitTaskId === obj.visitTaskId)
       var measureData = state.visitTaskList[index].MeasureData
-      console.log('removeCustomizeMeasuredData', obj, state.visitTaskList[index].MeasureData)
+      console.log('removeCustomizeMeasuredData',obj, state.visitTaskList[index].MeasureData)
       // var uuid = obj.measureData.data.uuid
       // var idx = measureData.findIndex(item => item.MeasureData && item.MeasureData.data && item.MeasureData.data.uuid === uuid)
       // console.log(obj, measureData)
@@ -681,7 +682,7 @@ const actions = {
       } else {
         // state.visitTaskList[index].MeasureData.push(obj.MeasureData.data)
         state.visitTaskList[index].MeasureData.push({
-          MeasureData: obj.measureData,
+          MeasureData: obj.measureData          ,
           SeriesId: obj.measureData.seriesId,
           StudyId: obj.measureData.studyId,
           InstanceId: obj.measureData.instanceId,
@@ -897,7 +898,7 @@ const actions = {
   },
   setImageloadedInfo({ state }, obj) {
     var index = state.visitTaskList.findIndex(i => i.VisitTaskId === obj.visitTaskId)
-    const prefetchInstanceCount = state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].prefetchInstanceCount
+    let prefetchInstanceCount = state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].prefetchInstanceCount
     state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].prefetchInstanceCount = prefetchInstanceCount + 100
     state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].imageloadedArr.push(obj.imageId)
   },

src/store/modules/trials.js

@@ -8,7 +8,6 @@ const getDefaultState = () => {
     visitPointQuery: null,
     studyListQuery: null,
     unlock: false,
-    config: {},
   }
 }
 
@@ -21,9 +20,6 @@ const mutations = {
   SET_UNLOCK: (state, unlock) => {
     state.unlock = unlock
   },
-  SET_CONFIG: (state, config) => {
-    state.config = config
-  },
   SET_ACTIVENAME: (state, activeName) => {
     state.trialDetailActiveName = activeName
   },
@@ -48,9 +44,6 @@ const actions = {
   setUnLock({ commit }, unlock) {
     commit('SET_UNLOCK', unlock)
   },
-  setConfig({ commit }, config) {
-    commit('SET_CONFIG', config)
-  },
   setActiveName({ commit }, activeName) {
     commit('SET_ACTIVENAME', activeName)
   },

src/utils/uploadZip.js

@@ -2,55 +2,44 @@ import JSZip from "jszip";
 import axios from "axios";
 import { saveAs } from "file-saver";
 import Vue from 'vue';
-import store from "@/store";
 import {
     requestPackageAndAnonymizImage,
 } from "@/api/load.js";
 let flag = {};
-export const resetFlag = () => {
+export const downloadImage = async (id, id2) => {
-    flag = {};
+    if (flag[id2]) return
-    store.dispatch("trials/setUnLock", false);
+    flag[id2] = true
-}
-export const downloadImage = async (id, id2, IsDicom = true) => {
-    if (flag[`${id2}_${IsDicom}`]) return Vue.prototype.$message.warning(Vue.prototype.$t('trials:upload:tip:uploading'));
-    flag[`${id2}_${IsDicom}`] = true
     try {
         let params = {
             TrialId: id,
-            SubjectVisitId: id2,
+            SubjectVisitId: id2
-            IsDicom: IsDicom
         }
-        store.dispatch("trials/setUnLock", true);
         let res = await requestPackageAndAnonymizImage(params);
+        flag[id2] = false;
         if (res.IsSuccess) {
             if (!res.Result) {
-                flag[`${id2}_${IsDicom}`] = false;
                 Vue.prototype.$message.warning(Vue.prototype.$t("trials:upload:message:not"))
                 return 1;
             }
-            Vue.prototype.$message.success(Vue.prototype.$t("trials:upload:message:startUpload"));
+            let a = document.createElement("a");
             let href = Vue.prototype.OSSclientConfig.basePath + res.Result;
-            download(href, res.OtherInfo.FileName, { id2, IsDicom })
+            let fileName =
+                res.Result.split("/")[res.Result.split("/").length - 1];
+            a.download = fileName;
+            a.href = href;
+            a.click();
+            URL.revokeObjectURL(href);
+            let timer = setTimeout(() => {
+                a = null;
+                href = null;
+                timer = null;
+            }, 500)
             return 2;
-            // let a = document.createElement("a");
-            // // let fileName =
-            // //     res.Result.split("/")[res.Result.split("/").length - 1];
-            // a.download = res.OtherInfo.FileName;
-            // a.href = href;
-            // a.click();
-            // URL.revokeObjectURL(href);
-            // let timer = setTimeout(() => {
-            //     a = null;
-            //     href = null;
-            //     timer = null;
-            // }, 500)
-            // return 2;
         } else {
-            flag[`${id2}_${IsDicom}`] = false;
             return false;
         }
     } catch (err) {
-        flag[`${id2}_${IsDicom}`] = false;
+        flag[id2] = false;
         console.log(err);
     }
 };
@@ -112,11 +101,11 @@ const setfolder = async (item) => {
                 })
                 .then((res) => {
                     saveAs(res, zipName + ".zip"); // 使用FileSaver.saveAs保存文件，文件名可自定义
-                    flag[`${id2}_${IsDicom}`] = false;
+                    flag[id2] = false;
                     zipObj = null;
                 });
         })
-        .catch((reason) => { flag[`${id2}_${IsDicom}`] = false; });
+        .catch((reason) => { flag[id2] = false; });
 };
 const handleBatchDown = async (item, zip) => {
     return new Promise((resolve) => {
@@ -153,47 +142,3 @@ export const fileDownload = (content, filename) => {
     eleLink.click();
     document.body.removeChild(eleLink);
 };
-let download = async (downloadUrl, downloadFileName, res) => {
-    const blob = await getBlob(downloadUrl);
-    flag[`${res.id2}_${res.IsDicom}`] = false;
-    store.dispatch("trials/setUnLock", false);
-    saveAsB(blob, downloadFileName);
-}
-
-let getBlob = (url) => {
-    return new Promise((resolve, reject) => {
-        const xhr = new XMLHttpRequest();
-
-        xhr.open('GET', url, true);
-        xhr.responseType = 'blob';
-        xhr.onload = () => {
-            if (xhr.status === 200) {
-                resolve(xhr.response);
-            } else {
-                reject(new Error(`Request failed with status ${xhr.status}`));
-            }
-        };
-        xhr.onerror = () => {
-            reject(new Error('Request failed'));
-        };
-
-        xhr.send();
-    });
-}
-
-let saveAsB = (blob, filename) => {
-    const link = document.createElement('a');
-    const body = document.body;
-
-    link.href = window.URL.createObjectURL(blob);
-    link.download = filename;
-
-    // hide the link
-    link.style.display = 'none';
-    body.appendChild(link);
-
-    link.click();
-    body.removeChild(link);
-
-    window.URL.revokeObjectURL(link.href);
-}

src/views/login/index.vue

@@ -183,7 +183,7 @@
           {{ $t("login:title:system_title") }}
         </p>
         <p style="margin-bottom: 20px" v-else>{{ $t("login:title:system") }}</p>
-        <p style="margin-bottom: 20px">V1.5.3.001</p>
+        <p style="margin-bottom: 20px">V1.5.2.001</p>
         <p style="margin-bottom: 20px" v-if="language === 'zh'">
           Copyright © {{ new Date().getFullYear() }} 上海展影医疗科技有限公司
           版权所有

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

@@ -121,7 +121,7 @@ export default {
     // 获取非Dicom检查信息
     getNoneDicomList() {
       this.loading = true
-      getNoneDicomStudyList(this.subjectVisitId, this.studyId).then(res => {
+      getNoneDicomStudyList(this.subjectVisitId, this.studyId, true).then(res => {
         this.studyList = res.Result
         this.loading = false
         const studyIndex = this.studyList.findIndex(item => {

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

@@ -62,7 +62,7 @@ export default {
     // 获取非Dicom检查信息
     getNoneDicomList() {
       this.loading = true
-      getNoneDicomStudyList(this.subjectVisitId, '').then(res => {
+      getNoneDicomStudyList(this.subjectVisitId, '', true).then(res => {
         this.noneDicomStudyList = res.Result
         this.loading = false
         const study = this.noneDicomStudyList.find((item, index) => {

src/views/trials/trials-panel/reading/ad-review/index.vue

@@ -203,7 +203,6 @@
           >
             <i slot="default" class="el-icon-plus" />
             <div slot="file" slot-scope="{file}">
-              <viewer :images="images" :ref="file.url">
               <img
                 class="el-upload-list__item-thumbnail"
                 :src="OSSclientConfig.basePath + file.url"
@@ -226,17 +225,23 @@
                   <i class="el-icon-delete" />
                 </span>
               </span>
-              </viewer>
             </div>
           </el-upload>
-          
+          <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">
+                {{ $t('trials:adReview:title:loading') }}<span class="dot">...</span>
+              </div>
+            </el-image>
+          </el-dialog>
         </el-form-item>
         <el-form-item v-if="adInfo.ReadingTaskState < 2">
           <div style="text-align:center;">
-            <el-button type="primary" @click="skipTask">
-              <!-- 跳过 -->
-              {{ $t('trials:readingReport:button:skip') }}
-            </el-button>
             <!-- 保存 -->
             <el-button type="primary" @click="handleSave">{{ $t('common:button:save') }}</el-button>
             <!-- 提交 -->
@@ -312,14 +317,12 @@ import { getJudgeReadingInfo,
   // uploadJudgeTaskImage,
   saveJudgeVisitTaskResult, submitJudgeVisitTaskResult, getReadingPastResultList } from '@/api/trials'
 import { getAutoCutNextTask } from '@/api/user'
-import { setSkipReadingCache } from '@/api/reading'
 import const_ from '@/const/sign-code'
 import { getToken } from '@/utils/auth'
 import SignForm from '@/views/trials/components/newSignForm'
 import DicomEvent from '@/views/trials/trials-panel/reading/dicoms/components/DicomEvent'
 import store from '@/store'
 import { changeURLStatic } from '@/utils/history.js'
-import Viewer from 'v-viewer'
 export default {
   name: 'AdReview',
   components: { SignForm },
@@ -387,8 +390,7 @@ export default {
       judgeResultArmEnum: '',
       criterionType: null,
       openWindow: null,
-      isFixed: false,
+      isFixed:false
-      images: []
     }
   },
   // watch: {
@@ -405,7 +407,6 @@ export default {
   //   }
   // },
   mounted() {
-    this.initializeViewer()
     this.criterionType = parseInt(this.$route.query.criterionType)
     this.getAdInfo()
     if (this.isReadingShowPreviousResults) {
@@ -707,42 +708,14 @@ export default {
     },
     // 预览图片
     handlePictureCardPreview(file) {
-      this.images = this.fileList.map(f => this.OSSclientConfig.basePath + f.url)
+      this.imageUrl = this.OSSclientConfig.basePath + file.url
-      // this.imageUrl = this.OSSclientConfig.basePath + file.url
+      this.imgVisible = true
-      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)
-    },
-    async skipTask() {
-      try {
-        // 是否确认跳过？
-        const confirm = await this.$confirm(
-          this.$t('trials:readingReport:message:skipConfirm'),
-          {
-            type: 'warning',
-            distinguishCancelAndClose: true
-          }
-        )
-        if (confirm !== 'confirm') return
-        this.loading = true
-        const res = await setSkipReadingCache({ visitTaskId: this.visitTaskId })
-        this.loading = false
-        if (res.IsSuccess) {
-          window.location.reload()
-        }
-      } catch (e) {
-        this.loading = false
-        console.log(e)
-      }
-    },
-    initializeViewer() {
-      Viewer.setDefaults({
-        toolbar: { zoomIn: true, zoomOut: true, rotateLeft: true, rotateRight: true, flipHorizontal: true, flipVertical: true }
-      })
     }
   }
 }

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

@@ -12,15 +12,6 @@
             style="margin-right:5px;"
             @change="handleShowDetail"
           />
-          <el-button
-            v-if="readingTaskState<2"
-            type="primary"
-            size="small"
-            @click="skipTask"
-          >
-            <!-- 跳过 -->
-            {{ $t('trials:readingReport:button:skip') }}
-          </el-button>
           <el-button
             v-if="readingTaskState<2"
             type="primary"
@@ -181,7 +172,8 @@
                         @change="evaluateReasonChange"
                       />
                       <!-- 系统评估结果为：xxx,与当前调整的结果不一致，请填写调整原因 -->
-                      <p v-if="currentEvaluateResult !== tumorEvaluate" style="width: 140px;padding:0 2px;white-space: normal;word-break: break-all;word-wrap: break-word;" v-html="getWarningText()" />
+                      <p v-if="currentEvaluateResult !== tumorEvaluate" style="width: 140px;padding:0 2px;white-space: normal;word-break: break-all;word-wrap: break-word;" v-html="getWarningText()">
+                      </p>
                       <p v-else-if="currentExistDisease !== isExistDisease" style="width: 140px;padding:0 2px;white-space: normal;word-break: break-all;word-wrap: break-word;">{{ $t('trials:readingReport:title:sysEvaluationRes') }}<span style="color:red">{{ $fd('ExistDisease',isExistDisease) }}</span>{{ $t('trials:readingReport:message:msg1') }}
                       </p>
                     </template>
@@ -270,7 +262,6 @@
 </template>
 <script>
 import { getReadingReportEvaluation, changeDicomReadingQuestionAnswer, submitDicomVisitTask, verifyVisitTaskQuestions, getTaskAdditionalQuestion } from '@/api/trials'
-import { setSkipReadingCache } from '@/api/reading'
 import { getAutoCutNextTask } from '@/api/user'
 import DicomEvent from './DicomEvent'
 import const_ from '@/const/sign-code'
@@ -825,36 +816,14 @@ export default {
       var sysRes = ''
       var curRes = ''
       if (this.CriterionType === 2) {
-        sysRes = this.$fd('ImagingOverallAssessment_Lugano', this.tumorEvaluate)
+        sysRes = this.$fd('ImagingOverallAssessment_Lugano',this.tumorEvaluate)
-        curRes = this.$fd('ImagingOverallAssessment_Lugano', this.currentEvaluateResult)
+        curRes = this.$fd('ImagingOverallAssessment_Lugano',this.currentEvaluateResult)
       } else {
-        sysRes = this.$fd('OverallAssessment', this.tumorEvaluate)
+        sysRes = this.$fd('OverallAssessment',this.tumorEvaluate)
-        curRes = this.$fd('OverallAssessment', this.currentEvaluateResult)
+        curRes = this.$fd('OverallAssessment',this.currentEvaluateResult)
       }
-      const msg = this.$t('trials:readingReport:message:msg9').replace('xxx', '<font color="red">' + sysRes + '</font>').replace('yyy', '<font color="red">' + curRes + '</font>')
+      let msg = this.$t('trials:readingReport:message:msg9').replace('xxx','<font color="red">' + sysRes + '</font>').replace('yyy','<font color="red">' + curRes + '</font>')
       return msg
-    },
-    async skipTask() {
-      try {
-        // 是否确认跳过？
-        const confirm = await this.$confirm(
-          this.$t('trials:readingReport:message:skipConfirm'),
-          {
-            type: 'warning',
-            distinguishCancelAndClose: true
-          }
-        )
-        if (confirm !== 'confirm') return
-        this.loading = true
-        const res = await setSkipReadingCache({ visitTaskId: this.visitTaskId })
-        this.loading = false
-        if (res.IsSuccess) {
-          window.location.reload()
-        }
-      } catch (e) {
-        this.loading = false
-        console.log(e)
-      }
     }
   }
 }

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

@@ -11,15 +11,6 @@
             style="margin-right:5px"
             @change="handleShowDetail"
           />
-          <el-button
-            v-if="readingTaskState<2"
-            type="primary"
-            size="small"
-            @click="skipTask"
-          >
-            <!-- 跳过 -->
-            {{ $t('trials:readingReport:button:skip') }}
-          </el-button>
           <el-button v-if="readingTaskState<2" type="primary" size="small" @click="getReportInfo">{{$t('trials:readingReport:button:refresh')}}</el-button>
           <el-button v-if="readingTaskState<2" type="primary" size="small" @click="handleSave(true)">{{$t('common:button:save')}}</el-button>
           <el-button v-if="readingTaskState<2" type="primary" size="small" @click="handleConfirm">{{$t('common:button:submit')}}</el-button>
@@ -269,7 +260,6 @@
 </template>
 <script>
 import { changeCalculationAnswer, getReadingReportEvaluation, changeDicomReadingQuestionAnswer, submitDicomVisitTask, verifyVisitTaskQuestions, getQuestionCalculateRelation } from '@/api/trials'
-import { setSkipReadingCache } from '@/api/reading'
 import DicomEvent from './../components/DicomEvent'
 import CustomizeReportPageUpload from './CustomizeReportPageUpload'
 import const_ from '@/const/sign-code'
@@ -838,28 +828,6 @@ export default {
           reject()
         })
       })
-    },
-    async skipTask() {
-      try {
-        // 是否确认跳过？
-        const confirm = await this.$confirm(
-          this.$t('trials:readingReport:message:skipConfirm'),
-          {
-            type: 'warning',
-            distinguishCancelAndClose: true
-          }
-        )
-        if (confirm !== 'confirm') return
-        this.loading = true
-        const res = await setSkipReadingCache({ visitTaskId: this.visitTaskId })
-        this.loading = false
-        if (res.IsSuccess) {
-          window.location.reload()
-        }
-      } catch (e) {
-        this.loading = false
-        console.log(e)
-      }
     }
   }
 }

src/views/trials/trials-panel/reading/global-review/index.vue

@@ -25,14 +25,7 @@
       </div>
 
       <div v-if=" readingTaskState < 2" style="text-align:right;margin:5px 0;">
-        <el-button
+
-            type="primary"
-            size="small"
-            @click="skipTask"
-          >
-            <!-- 跳过 -->
-            {{ $t('trials:readingReport:button:skip') }}
-          </el-button>
         <el-button size="small" type="primary" @click="handleSave">
           {{ $t('common:button:save') }}
         </el-button>
@@ -149,7 +142,6 @@
 <script>
 import { getGlobalReadingInfo, getReadingPastResultList, submitGlobalReadingInfo, saveGlobalReadingInfo } from '@/api/trials'
 import { getAutoCutNextTask } from '@/api/user'
-import { setSkipReadingCache } from '@/api/reading'
 import { getToken } from '@/utils/auth'
 import const_ from '@/const/sign-code'
 import DicomEvent from '@/views/trials/trials-panel/reading/dicoms/components/DicomEvent'
@@ -385,28 +377,6 @@ export default {
     handleSave() {
       this.$refs['globalTbl'].handleSave(true)
     },
-    async skipTask() {
-      try {
-        // 是否确认跳过？
-        const confirm = await this.$confirm(
-          this.$t('trials:readingReport:message:skipConfirm'),
-          {
-            type: 'warning',
-            distinguishCancelAndClose: true
-          }
-        )
-        if (confirm !== 'confirm') return
-        this.loading = true
-        const res = await setSkipReadingCache({ visitTaskId: this.visitTaskId })
-        this.loading = false
-        if (res.IsSuccess) {
-          window.location.reload()
-        }
-      } catch (e) {
-        this.loading = false
-        console.log(e)
-      }
-    },
     async handleConfirm() {
       // 判断是否存在访视评估结果未确认
       var idx = this.taskList.findIndex(i => !i.AgreeOrNotAnswer)

src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue

@@ -29,22 +29,11 @@
                   {{ $t('trials:medicalFeedback:message:msg2') }}
                   <ol>
                     <li v-for="file in record.FileList" :key="file.ImagePath" style="list-style: none;">
-                      <viewer
+                      <el-button
-                        v-if="file.ImagePath"
+                        type="text"
-                        :ref="file.ImagePath"
+                        size="mini"
-                        style="margin:0 10px;"
+                        @click="previewImage(file.ImagePath)"
-                        :images="[`${OSSclientConfig.basePath}${file.ImagePath}`]"
+                      >{{ file.FileName }}</el-button>
-                      >
-                        <el-button type="text" @click="previewImage(file.ImagePath)">
-                          {{ file.FileName }}
-                        </el-button>
-                        <img
-                          v-show="false"
-                          crossorigin="anonymous"
-                          :src="`${OSSclientConfig.basePath}${file.ImagePath}`"
-                          alt="Image"
-                        >
-                      </viewer>
                     </li>
                   </ol>
                 </div>
@@ -108,6 +97,22 @@
       </div>
 
     </div>
+    <el-dialog
+      v-if="previewDialog"
+      append-to-body
+      :close-on-click-modal="false"
+      :visible.sync="previewDialog"
+      width="600px"
+    >
+      <!-- <img width="100%" :src="imagePath" alt="图片未找到"> -->
+      <el-image :src="imagePath" crossorigin="anonymous" width="100%">
+        <div slot="placeholder" class="image-slot">
+          <!-- 加载中 -->
+          {{ $t('trials:medicalFeedback:message:loading') }}<span class="dot">...</span>
+        </div>
+      </el-image>
+
+    </el-dialog>
 
     <el-dialog
       v-if="irFeedbackForm.visible"
@@ -132,7 +137,6 @@ import { getMedicalReviewDialog } from '@/api/trials'
 import FeedbackForm from './FeedbackForm'
 import mimAvatar from '@/assets/MIM.png'
 import irAvatar from '@/assets/IR.png'
-import Viewer from 'v-viewer'
 export default {
   name: 'ChatForm',
   components: { FeedbackForm },
@@ -166,7 +170,6 @@ export default {
     }
   },
   mounted() {
-    this.initializeViewer()
     this.getMessageList()
   },
   methods: {
@@ -201,12 +204,6 @@ export default {
     previewImage(path) {
       this.imagePath = `${this.OSSclientConfig.basePath}${path}`
       this.previewDialog = true
-      this.$refs[path][0].$viewer.show()
-    },
-    initializeViewer() {
-      Viewer.setDefaults({
-        toolbar: { zoomIn: true, zoomOut: true, rotateLeft: true, rotateRight: true, flipHorizontal: true, flipVertical: true }
-      })
     }
   }
 

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

@@ -29,22 +29,11 @@
                   {{ $t('trials:medicalFeedback:message:msg2') }}
                   <ol>
                     <li v-for="file in record.FileList" :key="file.ImagePath" style="list-style: none;">
-                      <viewer
+                      <el-button
-                        v-if="file.ImagePath"
+                        type="text"
-                        :ref="file.ImagePath"
+                        size="mini"
-                        style="margin:0 10px;"
+                        @click="previewImage(file.ImagePath)"
-                        :images="[`${OSSclientConfig.basePath}${file.ImagePath}`]"
+                      >{{ file.FileName }}</el-button>
-                      >
-                        <el-button type="text" @click="previewImage(file.ImagePath)">
-                          {{ file.FileName }}
-                        </el-button>
-                        <img
-                          v-show="false"
-                          crossorigin="anonymous"
-                          :src="`${OSSclientConfig.basePath}${file.ImagePath}`"
-                          alt="Image"
-                        >
-                      </viewer>
                     </li>
                   </ol>
                 </div>
@@ -136,6 +125,19 @@
       </div>
     </div>
 
+    <el-dialog
+      append-to-body
+      :visible.sync="previewDialog"
+      width="600px"
+    >
+      <!-- <img width="100%" :src="imagePath" alt="图片未找到"> -->
+      <el-image :src="OSSclientConfig.basePath + imagePath" width="100%" crossorigin="anonymous">
+        <div slot="placeholder" class="image-slot">
+          {{ $t('trials:medicalFeedback:message:loading') }}<span class="dot">...</span>
+        </div>
+      </el-image>
+    </el-dialog>
+
     <el-dialog
       v-if="irFeedbackForm.visible"
       :visible.sync="irFeedbackForm.visible"
@@ -152,7 +154,6 @@
         @close="irFeedbackForm.visible = false"
       />
     </el-dialog>
-    
   </div>
 </template>
 <script>
@@ -160,7 +161,6 @@ import { getMedicalReviewDialog, sendMedicalReviewDialog } from '@/api/trials'
 import FeedbackForm from '@/views/trials/trials-panel/reading/medical-feedback/components/FeedbackForm'
 import mimAvatar from '@/assets/MIM.png'
 import irAvatar from '@/assets/IR.png'
-import Viewer from 'v-viewer'
 export default {
   name: 'ChatForm',
   components: {
@@ -196,7 +196,6 @@ export default {
     }
   },
   mounted() {
-    this.initializeViewer()
     this.getMessageList()
   },
   methods: {
@@ -243,18 +242,12 @@ export default {
     previewImage(path) {
       this.imagePath = `${path}`
       this.previewDialog = true
-      this.$refs[path][0].$viewer.show()
     },
     handleIRReply() {
       // '反馈'
       this.irFeedbackForm.title = this.$t('trials:medicalFeedback:title:feedback')
 
       this.irFeedbackForm.visible = true
-    },
-    initializeViewer() {
-      Viewer.setDefaults({
-        toolbar: { zoomIn: true, zoomOut: true, rotateLeft: true, rotateRight: true, flipHorizontal: true, flipVertical: true }
-      })
     }
   }
 

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

@@ -92,7 +92,6 @@
         >
           <i slot="default" class="el-icon-plus" />
           <div slot="file" slot-scope="{file}">
-            <viewer :images="images" :ref="file.url">
             <img
               class="el-upload-list__item-thumbnail"
               :src="OSSclientConfig.basePath + file.url"
@@ -115,26 +114,24 @@
                 <i class="el-icon-delete" />
               </span>
             </span>
-            </viewer>
           </div>
         </el-upload>
-        <!-- <el-dialog
+        <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">
               {{ $t('trials:medicalFeedback:message:loading') }}<span class="dot">...</span>
             </div>
           </el-image>
-        </el-dialog> -->
+        </el-dialog>
       </el-form-item>
 
     </el-form>
-    <!-- <viewer v-if="imgVisible" :images="[imageUrl]" ref="viewer">
+
-      <img :src="imageUrl"  crossorigin="anonymous" alt="">
-    </viewer> -->
     <el-dialog
       v-if="chatVisible"
       :visible.sync="chatVisible"
@@ -173,7 +170,6 @@
 import { saveMedicalReviewInfo } from '@/api/trials'
 import ChatForm from './ChatForm'
 import CloseQC from './CloseQC'
-import Viewer from 'v-viewer'
 export default {
   name: 'AuditConclusions',
   components: {
@@ -224,12 +220,10 @@ export default {
       userTypeEnumInt: zzSessionStorage.getItem('userTypeEnumInt') * 1,
       isClosedDialog: false,
       isSendMessage: false,
-      closeQuestionVisible: false,
+      closeQuestionVisible: false
-      images:[]
     }
   },
   mounted() {
-    this.initializeViewer()
     this.initForm()
   },
   methods: {
@@ -385,20 +379,14 @@ export default {
     },
     // 预览图片
     handlePictureCardPreview(file) {
-      this.images = this.fileList.map(f => this.OSSclientConfig.basePath + f.url)
+      this.imageUrl = this.OSSclientConfig.basePath + file.url
-      // this.imageUrl = this.OSSclientConfig.basePath + file.url
+      this.imgVisible = true
-      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)
-    },
-    initializeViewer() {
-      Viewer.setDefaults({
-        toolbar: { zoomIn: true, zoomOut: true, rotateLeft: true, rotateRight: true, flipHorizontal: true, flipVertical: true}
-      })
     }
   }
 }

src/views/trials/trials-panel/reading/oncology-review/index.vue

@@ -26,14 +26,6 @@
         >
           {{ $t('trials:oncologyReview:button:clinicalData') }}
         </el-button>
-        <el-button
-          type="primary"
-          size="small"
-          @click="skipTask"
-        >
-          <!-- 跳过 -->
-          {{ $t('trials:readingReport:button:skip') }}
-        </el-button>
         <!-- 保存 -->
         <el-button
           v-if="oncologyInfo.ReadingTaskState < 2"
@@ -261,7 +253,6 @@
 </template>
 <script>
 import { getOncologyReadingInfo, getReadingPastResultList, setOncologyReadingInfo, submitOncologyReadingInfo } from '@/api/trials'
-import { setSkipReadingCache } from '@/api/reading'
 import const_ from '@/const/sign-code'
 import { getToken } from '@/utils/auth'
 import DicomEvent from '@/views/trials/trials-panel/reading/dicoms/components/DicomEvent'
@@ -563,28 +554,6 @@ export default {
         path: `/clinicalData?subjectId=${this.oncologyInfo.SubjectId}&trialId=${this.trialId}&visitTaskId=${this.oncologyInfo.OncologyTaskId}&TokenKey=${token}`
       })
       window.open(routeData.href, '_blank')
-    },
-    async skipTask() {
-      try {
-        // 是否确认跳过？
-        const confirm = await this.$confirm(
-          this.$t('trials:readingReport:message:skipConfirm'),
-          {
-            type: 'warning',
-            distinguishCancelAndClose: true
-          }
-        )
-        if (confirm !== 'confirm') return
-        this.loading = true
-        const res = await setSkipReadingCache({ visitTaskId: this.visitTaskId })
-        this.loading = false
-        if (res.IsSuccess) {
-          window.location.reload()
-        }
-      } catch (e) {
-        this.loading = false
-        console.log(e)
-      }
     }
   }
 }

src/views/trials/trials-panel/reading/reading-task/index.vue

@@ -78,7 +78,8 @@
                         ? 'warning'
                         : 'primary'
                     "
-                  >{{ $fd("YesOrNo", scope.row.IsUrgent) }}</el-tag>
+                    >{{ $fd("YesOrNo", scope.row.IsUrgent) }}</el-tag
+                  >
                 </template>
               </el-table-column>
               <!-- 受试者编号 -->
@@ -116,7 +117,8 @@
                           ? '#E6A23C'
                           : '#409EFF',
                     }"
-                  >{{ scope.row.UrgentCount }}</span>
+                    >{{ scope.row.UrgentCount }}</span
+                  >
                 </template>
               </el-table-column>
               <!-- 建议完成时间 -->
@@ -155,12 +157,12 @@
                   />
                   <!-- 上传 -->
                   <el-button
+                    v-hasPermi="['role:ir']"
                     v-if="
                       item.CriterionType === 0 &&
                       item.ImageUploadEnum > 0 &&
                       item.IsReadingTaskViewInOrder > 0
                     "
-                    v-hasPermi="['role:ir']"
                     circle
                     icon="el-icon-upload2"
                     :title="$t('trials:pendingReadingTasks:button:upload')"
@@ -168,12 +170,12 @@
                   />
                   <!-- 下载 -->
                   <el-button
+                    v-hasPermi="['role:ir']"
                     v-if="
                       item.CriterionType === 0 &&
                       item.ImageDownloadEnum === 1 &&
                       item.IsReadingTaskViewInOrder > 0
                     "
-                    v-hasPermi="['role:ir']"
                     circle
                     icon="el-icon-download"
                     :title="$t('trials:pendingReadingTasks:button:download')"
@@ -262,8 +264,8 @@
     <upload-image
       v-if="uploadImageVisible"
       :visible.sync="uploadImageVisible"
-      :subject-id="uploadSubjectId"
+      :SubjectId="uploadSubjectId"
-      :criterion="uploadTrialCriterion"
+      :Criterion="uploadTrialCriterion"
       :status="uploadStatus"
       @getList="getList"
     />
@@ -272,36 +274,35 @@
 <script>
 import {
   getIRUnReadSubjectTaskList,
-  verifyReadingRestTime
+  verifyReadingRestTime,
-} from '@/api/trials'
+} from "@/api/trials";
-import { getTrialCriterionList } from '@/api/trials/reading'
+import { getTrialCriterionList } from "@/api/trials/reading";
-import { clearSkipReadingCache } from '@/api/reading'
+import BaseContainer from "@/components/BaseContainer";
-import BaseContainer from '@/components/BaseContainer'
+import uploadImage from "@/components/uploadImage";
-import uploadImage from '@/components/uploadImage'
+import Pagination from "@/components/Pagination";
-import Pagination from '@/components/Pagination'
+import { getToken } from "@/utils/auth";
-import { getToken } from '@/utils/auth'
 const searchDataDefault = () => {
   return {
-    SubjectCode: '',
+    SubjectCode: "",
     PageIndex: 1,
-    PageSize: 20
+    PageSize: 20,
-  }
+  };
-}
+};
 export default {
-  name: 'ReadingTaskList',
+  name: "ReadingTaskList",
-  components: { BaseContainer, Pagination, 'upload-image': uploadImage },
+  components: { BaseContainer, Pagination, "upload-image": uploadImage },
   data() {
     return {
       searchData: searchDataDefault(),
       list: [],
       total: 0,
       loading: false,
-      trialId: '',
+      trialId: "",
       isReadingTaskViewInOrder: null,
       randomReadInfo: {},
       isRender: false,
       trialCriterionList: [],
-      TrialReadingCriterionId: '',
+      TrialReadingCriterionId: "",
       isTableShow: true,
       readingTool: null,
       criterionType: null,
@@ -311,146 +312,147 @@ export default {
       uploadImageVisible: false,
       uploadSubjectId: null,
       uploadTrialCriterion: {},
-      uploadStatus: 'upload'
+      uploadStatus: "upload",
-    }
+    };
   },
   watch: {
     TrialReadingCriterionId(v) {
       if (v) {
-        this.getList()
+        this.getList();
-      }
       }
     },
+  },
   mounted() {
-    window.addEventListener('message', this.receiveMsg)
+    window.addEventListener("message", this.receiveMsg);
-    this.trialId = this.$route.query.trialId
+    this.trialId = this.$route.query.trialId;
-    this.getTrialCriterionList()
+    this.getTrialCriterionList();
   },
   beforeDestroy() {
-    window.removeEventListener('message', this.receiveMsg)
+    window.removeEventListener("message", this.receiveMsg);
     if (this.openWindow) {
-      this.openWindow.close()
+      this.openWindow.close();
     }
   },
   methods: {
     // 打开上传下载弹框
     openUploadImage(item, trialCriterion, status) {
-      this.uploadSubjectId = item.SubjectId
+      this.uploadSubjectId = item.SubjectId;
-      this.uploadTrialCriterion = trialCriterion
+      this.uploadTrialCriterion = trialCriterion;
-      this.uploadStatus = status
+      this.uploadStatus = status;
-      this.uploadImageVisible = true
+      this.uploadImageVisible = true;
     },
-    async getTrialCriterionList() {
+    getTrialCriterionList() {
-      try {
+      getTrialCriterionList(this.trialId)
-        const res = await getTrialCriterionList(this.trialId)
+        .then((res) => {
-        if (res.IsSuccess) {
+          this.trialCriterionList = res.Result;
-          this.trialCriterionList = res.Result
           this.TrialReadingCriterionId =
-            this.trialCriterionList[0].TrialReadingCriterionId
+            this.trialCriterionList[0].TrialReadingCriterionId;
-        }
+        })
-      } catch (e) {
+        .catch(() => {});
-        console.log(e)
-      }
     },
-    async getList() {
+    getList() {
-      try {
+      this.loading = true;
-        this.loading = true
+      this.searchData.TrialId = this.trialId;
-        this.searchData.TrialId = this.trialId
+      this.searchData.TrialReadingCriterionId = this.TrialReadingCriterionId;
-        this.searchData.TrialReadingCriterionId = this.TrialReadingCriterionId
+      this.isRender = false;
-        this.isRender = false
+      getIRUnReadSubjectTaskList(this.searchData)
-        const res = await getIRUnReadSubjectTaskList(this.searchData)
+        .then((res) => {
-        if (res.IsSuccess) {
           this.isReadingTaskViewInOrder =
-            res.OtherInfo.IsReadingTaskViewInOrder
+            res.OtherInfo.IsReadingTaskViewInOrder;
-          this.readingTool = res.OtherInfo.ReadingTool
+          this.readingTool = res.OtherInfo.ReadingTool;
-          this.criterionType = res.OtherInfo.CriterionType
+          this.criterionType = res.OtherInfo.CriterionType;
           if (res.OtherInfo.IsReadingTaskViewInOrder) {
-            this.list = res.Result.CurrentPageData
+            this.list = res.Result.CurrentPageData;
-            this.total = res.Result.TotalCount
+            this.total = res.Result.TotalCount;
           } else {
-            this.randomReadInfo = res.OtherInfo.RandomReadInfo
+            this.randomReadInfo = res.OtherInfo.RandomReadInfo;
-          }
-          this.isRender = true
-          this.loading = false
-        }
-      } catch (e) {
-        this.isRender = true
-        this.loading = false
           }
+          this.isRender = true;
+          this.loading = false;
+        })
+        .catch(() => {
+          this.isRender = true;
+          this.loading = false;
+        });
     },
     handleSearch() {
-      this.searchData.PageIndex = 1
+      this.searchData.PageIndex = 1;
-      this.getList()
+      this.getList();
     },
     handleReset() {
-      this.searchData = searchDataDefault()
+      this.searchData = searchDataDefault();
-      this.getList()
+      this.getList();
     },
-    async handleReadImage(row) {
+    handleReadImage(row) {
       if (this.openWindow) {
-        this.openWindow.close()
+        this.openWindow.close();
       }
-      try {
+      this.loading = true;
-        this.loading = true
+      verifyReadingRestTime()
-        await clearSkipReadingCache()
+        .then((_) => {
-        await verifyReadingRestTime()
+          this.loading = false;
-        this.loading = false
-        window.localStorage.setItem('TrialReadingCriterionId', this.TrialReadingCriterionId)
-        var token = getToken()
-        var path = ''
-        if (this.readingTool === 0) {
-          path = `/readingDicoms?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${row.SubjectCode}&subjectId=${row.SubjectId}&isReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&TokenKey=${token}`
-        } else {
-          path = `/noneDicomReading?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${row.SubjectCode}&subjectId=${row.SubjectId}&isReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&TokenKey=${token}`
-        }
-        var routeData = this.$router.resolve({ path })
 
-        this.openWindow = window.open(routeData.href, '_blank')
+          window.localStorage.setItem(
-      } catch (e) {
+            "TrialReadingCriterionId",
-        this.loading = false
+            this.TrialReadingCriterionId
-        console.log(e)
+          );
-      }
+          var token = getToken();
-    },
+          var path = "";
-    async handleOutOfOrderReading() {
-      if (this.openWindow) {
-        this.openWindow.close()
-      }
-      try {
-        this.loading = true
-        await clearSkipReadingCache()
-        await verifyReadingRestTime()
-        this.loading = false
-        window.localStorage.setItem('TrialReadingCriterionId', this.TrialReadingCriterionId)
-        var token = getToken()
-        var path = ''
           if (this.readingTool === 0) {
-          path = `/readingDicoms?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&isReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&TokenKey=${token}`
+            path = `/readingDicoms?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${row.SubjectCode}&subjectId=${row.SubjectId}&isReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&TokenKey=${token}`;
           } else {
-          path = `/noneDicomReading?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&isReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&TokenKey=${token}`
+            path = `/noneDicomReading?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${row.SubjectCode}&subjectId=${row.SubjectId}&isReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&TokenKey=${token}`;
           }
-        var routeData = this.$router.resolve({ path })
+          var routeData = this.$router.resolve({ path });
-        this.openWindow = window.open(routeData.href, '_blank')
+
-      } catch (e) {
+          this.openWindow = window.open(routeData.href, "_blank");
-        this.loading = false
+        })
-        console.log(e)
+        .catch(() => {
+          this.loading = false;
+        });
+    },
+    handleOutOfOrderReading() {
+      if (this.openWindow) {
+        this.openWindow.close();
       }
+      this.loading = true;
+      verifyReadingRestTime()
+        .then((_) => {
+          this.loading = false;
+          window.localStorage.setItem(
+            "TrialReadingCriterionId",
+            this.TrialReadingCriterionId
+          );
+          var token = getToken();
+          var path = "";
+          if (this.readingTool === 0) {
+            path = `/readingDicoms?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&isReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&TokenKey=${token}`;
+          } else {
+            path = `/noneDicomReading?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&isReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&TokenKey=${token}`;
+          }
+          var routeData = this.$router.resolve({ path });
+          this.openWindow = window.open(routeData.href, "_blank");
+        })
+        .catch(() => {
+          this.loading = false;
+        });
     },
     receiveMsg(event) {
-      if (event.data === 'refreshTaskList') {
+      if (event.data === "refreshTaskList") {
-        this.getList()
+        this.getList();
       }
     },
     // 排序
     handleSortChange(column) {
-      if (column.order === 'ascending') {
+      if (column.order === "ascending") {
-        this.searchData.Asc = true
+        this.searchData.Asc = true;
       } else {
-        this.searchData.Asc = false
+        this.searchData.Asc = false;
       }
-      this.searchData.SortField = column.prop
+      this.searchData.SortField = column.prop;
-      this.searchData.PageIndex = 1
+      this.searchData.PageIndex = 1;
-      this.getList()
+      this.getList();
-    }
+    },
-  }
+  },
-}
+};
 </script>

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

@@ -412,7 +412,6 @@ import { getToken } from '@/utils/auth'
 // import PreviewFiles from './previewFiles'
 import uploadVideos from '@/components/videos'
 import moment from 'moment'
-import store from "@/store";
 export default {
   name: 'UploadNonDicomFiles',
   components: { uploadVideos },
@@ -471,8 +470,7 @@ export default {
       uploadVideoVisible: false,
       trialId: this.$route.query.trialId,
       moment,
-      BodyPart:{},
+      BodyPart:{}
-      studyMonitorId: null
     };
   },
   async mounted() {
@@ -499,12 +497,6 @@ export default {
         });
       }
     },
-    btnLoading(){
-      store.dispatch("trials/setUnLock", this.btnLoading);
-    }
-  },
-  beforeDestroy(){
-    store.dispatch("trials/setUnLock", false);
   },
   methods: {
     // 初始化非Dicom列表数据
@@ -760,21 +752,12 @@ export default {
         this.selectArr.forEach(item=>item.status = 0);
         let num = this.selectArr.length > 6 ? 6 : this.selectArr.length;
         let funArr = [];
-        let res = await preArchiveStudy({
-          subjectVisitId: this.subjectVisitId,
-          isDicom: false
-        });
-        if(res.IsSuccess){
-          this.studyMonitorId = res.Result;
         for (let i = 0; i < num; i++) {
           funArr.push(this.handleUploadTask(this.selectArr, i));
         }
         if (funArr.length > 0) {
           let res = await Promise.all(funArr);
         }
-        }else{
-          this.isFail = true;
-        }
       }
     },
     // 并发上传
@@ -831,12 +814,16 @@ export default {
     // 非Dicom文件上传归档
     submitFile(uploadedFileList){
       if(!this.uploadVisible) return;
+      preArchiveStudy({
+        subjectVisitId: this.subjectVisitId,
+        isDicom: false
+      }).then(res => {
         this.btnLoading = true
         var params = {
           trialId: this.trialId,
           subjectVisitId: this.subjectVisitId,
           noneDicomStudyId:this.currentRow.Id,
-          studyMonitorId: this.studyMonitorId,
+          studyMonitorId: res.Result,
           uploadedFileList: uploadedFileList
         }
         uploadNoneDicomFile(params).then(res => {
@@ -846,6 +833,7 @@ export default {
           this.$emit('getList')
           this.$message.success(this.$t('trials:uploadNonDicoms:message:uploadedSuccessfully'))
         }).catch(() => { this.btnLoading = false })
+      })
     },
     resetFileDiaolg(){
       this.btnLoading = false

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

@@ -43,16 +43,6 @@
               </el-col>
             </el-row>
             <div style="text-align: right">
-              <!-- 下载所有影像 -->
-              <el-button
-                v-if="$store.state.trials.config.IsSupportQCDownloadImage"
-                size="small"
-                type="primary"
-                style="margin-left: 10px"
-                @click="downloadImage(true)"
-              >
-                {{ $t("trials:audit:button:downLoadAllDiocms") }}
-              </el-button>
               <!-- 预览所有影像 -->
               <el-button
                 size="small"
@@ -295,16 +285,6 @@
               </el-col>
             </el-row>
             <div style="text-align: right">
-              <!-- 下载所有影像 -->
-              <el-button
-                v-if="$store.state.trials.config.IsSupportQCDownloadImage"
-                size="small"
-                type="primary"
-                style="margin-left: 10px"
-                @click="downloadImage(false)"
-              >
-                {{ $t("trials:audit:button:downLoadAllNonDiocms") }}
-              </el-button>
               <!-- 预览 -->
               <el-button
                 size="small"
@@ -1218,7 +1198,6 @@ import SignForm from "@/views/trials/components/newSignForm";
 import { getToken } from "@/utils/auth";
 import const_ from "@/const/sign-code";
 import uploadPetClinicalData from "@/views/trials/trials-panel/visit/crc-upload/components/uploadPetClinicalData.vue";
-import { downloadImage , resetFlag } from "@/utils/uploadZip.js";
 export default {
   name: "QualityAssurance",
   components: {
@@ -1331,9 +1310,6 @@ export default {
       BodyPart: {},
     };
   },
-  beforeDestroy(){
-    resetFlag();
-  },
   async mounted() {
     this.BodyPart.Bodypart = await this.$getBodyPart(this.$route.query.trialId);
     if (this.disabled) {
@@ -1356,18 +1332,6 @@ export default {
     }
   },
   methods: {
-    // 打包下载
-    async downloadImage(IsDicom) {
-      try {
-        await downloadImage(
-          this.$route.query.trialId,
-          this.data.Id,
-          IsDicom
-        );
-      } catch (err) {
-        console.log(err);
-      }
-    },
     // 获取QC界面基本信息
     getQCInfo() {
       this.loading = true;

vue.config.js

@@ -63,8 +63,7 @@ module.exports = {
         // target: 'http://123.56.94.154:8079', // 国内测试环境2
         // target: 'http://123.56.94.154:7000', // 国内测试环境2
         // target: 'http://123.56.94.154:30668',
-        // target: 'http://106.14.89.110:30000',
+        target: 'http://106.14.89.110:30000',
-        target: 'http://47.117.164.182:7010', // uat
         // target: 'http://123.56.181.144:7000',
         changeOrigin: true,
         secure: false,
@@ -95,7 +94,7 @@ module.exports = {
           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 +123,7 @@ module.exports = {
       // 生成文件的最大体积
       maxAssetSize: 3000000000,
       // 只给出js的性能提示
-      assetFilter: function(assetFileName) {
+      assetFilter: function (assetFileName) {
         return assetFileName.endsWith('.js')
       }
     },