src/api/load.js

@@ -79,20 +79,4 @@ export function verifyIRStudyAllowUpload(data) {
         method: 'post',
         data
     })
-}
-// 影像下载成功确认
-export function downloadImageSuccess(params) {
-    return request({
-        url: '/DownloadAndUpload/downloadImageSuccess',
-        method: 'post',
-        params
-    })
-}
-// 影像下载记录列表
-export function getTrialDownloadList(data) {
-    return request({
-        url: '/DownloadAndUpload/getTrialDownloadList',
-        method: 'post',
-        data
-    })
 }

src/components/downloadDicomAndNonedicom/index.vue

@@ -143,7 +143,6 @@
 import {
   getSubjectImageDownloadSelectList,
   getIRReadingDownloadStudyInfo,
-  downloadImageSuccess,
 } from '@/api/load.js'
 import studyView from '@/components/uploadDicomAndNonedicom/study-view.vue'
 import store from '@/store'
@@ -208,7 +207,6 @@ export default {
       modelList: [],
       IsDicom: true,
       open: null,
-      downloadId: null,
     }
   },
   mounted() {
@@ -318,7 +316,6 @@ export default {
         let res = await getIRReadingDownloadStudyInfo(data)
         this.btnLoading = false
         if (res.IsSuccess) {
-          this.downloadId = res.OtherInfo
           this.downloadImage(res.Result)
         }
       } catch (err) {
@@ -330,10 +327,7 @@ export default {
     async downloadImage(data) {
       try {
         let { files, name, fileType } = this.formatDownloadFile(data)
-        let res = await downLoadFile(files, name, 'zip')
+        await downLoadFile(files, name, 'zip')
-        if (res && this.downloadId) {
-          this.downloadImageSuccess()
-        }
       } catch (err) {
         console.log(err)
       }
@@ -388,17 +382,6 @@ export default {
 
       return { files, name }
     },
-    // 影像下载成功确认
-    async downloadImageSuccess() {
-      try {
-        let params = {
-          TrialImageDownloadId: this.downloadId,
-        }
-        await downloadImageSuccess(params)
-      } catch (err) {
-        console.log(err)
-      }
-    },
     handleOpenDialog(item) {
       this.model_cfg.title = `${item.SubjectCode || ''} > ${item.TaskBlindName}`
       if (item.IsDicom) {

src/views/trials/trials-panel/trial-summary/download-monitor/index.vue

@@ -1,349 +0,0 @@
-/* eslint-disable */
-<template>
-  <BaseContainer>
-    <template slot="search-container">
-      <el-form :inline="true">
-        <!-- 受试者编号 -->
-        <el-form-item :label="$t('trials:downloadMonitor:table:subjectId')">
-          <el-input
-            v-model="searchData.SubjectCode"
-            style="width: 120px"
-            clearable
-          />
-        </el-form-item>
-        <!-- IP -->
-        <el-form-item :label="$t('trials:downloadMonitor:table:IP')">
-          <el-input v-model="searchData.Ip" style="width: 120px" clearable />
-        </el-form-item>
-        <!-- 用户名称 -->
-        <el-form-item :label="$t('trials:downloadMonitor:table:userName')">
-          <el-input
-            v-model="searchData.UserName"
-            style="width: 120px"
-            clearable
-          />
-        </el-form-item>
-        <!-- 用户类型 -->
-        <el-form-item
-          class="my_multiple"
-          :label="$t('trials:downloadMonitor:table:userType')"
-        >
-          <el-select
-            v-model="searchData.UserType"
-            style="width: 140px"
-            clearable
-          >
-            <el-option
-              v-for="item of $d.UserType"
-              :key="item.id"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <!-- 影像类型 -->
-        <el-form-item
-          class="my_multiple"
-          :label="$t('trials:downloadMonitor:table:imageType')"
-        >
-          <el-select
-            v-model="searchData.ImageType"
-            style="width: 140px"
-            clearable
-          >
-            <el-option
-              v-for="item of $d.downloadImageType"
-              :key="item.id"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item :label="$t('trials:downloadMonitor:table:downloadTime')">
-          <el-date-picker
-            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')"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            @change="handleDatetimeChange"
-          />
-        </el-form-item>
-        <el-form-item>
-          <!-- 查询 -->
-          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
-            {{ $t('common:button:search') }}
-          </el-button>
-          <!-- 重置 -->
-          <el-button
-            type="primary"
-            icon="el-icon-refresh-left"
-            @click="handleReset"
-          >
-            {{ $t('common:button:reset') }}
-          </el-button>
-          <!--导出-->
-          <!-- <el-button
-            type="primary"
-            icon="el-icon-download"
-            @click="handleExport"
-          >
-            {{ $t('common:button:export') }}
-          </el-button> -->
-        </el-form-item>
-      </el-form>
-    </template>
-    <template slot="main-container">
-      <el-table
-        v-adaptive="{ bottomOffset: 60 }"
-        v-loading="loading"
-        :data="list"
-        stripe
-        height="100"
-        @sort-change="handleSortByColumn"
-        :default-sort="{ prop: 'DownloadStartTime', order: 'descending' }"
-      >
-        <el-table-column type="index" width="40" align="left" />
-        <!-- 受试者编号 -->
-        <el-table-column
-          prop="SubjectCode"
-          min-width="130"
-          :label="$t('trials:downloadMonitor:table:subjectId')"
-          show-overflow-tooltip
-          sortable="custom"
-        />
-        <!-- IP -->
-        <el-table-column
-          prop="IP"
-          min-width="80"
-          :label="$t('trials:downloadMonitor:table:IP')"
-          show-overflow-tooltip
-          sortable="custom"
-        />
-        <!-- 访视名 -->
-        <el-table-column
-          prop="VisitName"
-          min-width="100"
-          :label="$t('trials:downloadMonitor:table:visitName')"
-          show-overflow-tooltip
-          sortable="custom"
-        />
-        <!-- 用户名 -->
-        <el-table-column
-          prop="UserName"
-          min-width="100"
-          :label="$t('trials:downloadMonitor:table:user')"
-          show-overflow-tooltip
-          sortable="custom"
-        />
-        <!-- 用户姓名 -->
-        <el-table-column
-          prop="UserFullName"
-          min-width="100"
-          :label="$t('trials:downloadMonitor:table:userName')"
-          show-overflow-tooltip
-          sortable="custom"
-        />
-        <!-- 用户类型 -->
-        <el-table-column
-          prop="VisitName"
-          min-width="80"
-          :label="$t('trials:downloadMonitor:table:userType')"
-          show-overflow-tooltip
-          sortable="custom"
-        >
-          <template slot-scope="scope">
-            <span>
-              {{ $fd('UserType', scope.row.UserTypeEnum) }}
-            </span>
-          </template>
-        </el-table-column>
-        <!-- 检查数量 -->
-        <el-table-column
-          prop="VisitName"
-          min-width="80"
-          :label="$t('trials:downloadMonitor:table:studyNum')"
-          show-overflow-tooltip
-          sortable="custom"
-        >
-          <template slot-scope="scope">
-            <span>{{
-              scope.row.DicomStudyCount + scope.row.NoneDicomStudyCount
-            }}</span>
-          </template>
-        </el-table-column>
-        <!-- 影像类型 -->
-        <el-table-column
-          prop="ImageType"
-          min-width="150"
-          :label="$t('trials:downloadMonitor:table:imageType')"
-          show-overflow-tooltip
-          sortable="custom"
-        >
-          <template slot-scope="scope">
-            <el-tag>
-              {{ $fd('downloadImageType', scope.row.ImageType) }}
-            </el-tag>
-          </template>
-        </el-table-column>
-        <!-- 下载影像数量 -->
-        <el-table-column
-          prop="ImageCount"
-          min-width="100"
-          :label="$t('trials:downloadMonitor:table:downloadImageNum')"
-          show-overflow-tooltip
-          sortable="custom"
-        />
-        <!-- 下载影像大小 -->
-        <el-table-column
-          prop="ImageSize"
-          min-width="130"
-          :label="$t('trials:downloadMonitor:table:downloadImageSize')"
-          show-overflow-tooltip
-          sortable="custom"
-        >
-          <template slot-scope="scope">
-            {{ fileSizeFormatter(scope.row.ImageSize) }}
-          </template>
-        </el-table-column>
-        <!-- 状态 -->
-        <el-table-column
-          prop="IsSuccess"
-          min-width="130"
-          :label="$t('trials:downloadMonitor:table:status')"
-          show-overflow-tooltip
-          sortable="custom"
-        >
-          <template slot-scope="scope">
-            <el-tag :type="scope.row.IsSuccess ? 'success' : 'danger'">
-              {{ $fd('downloadIsSuccess', scope.row.IsSuccess) }}
-            </el-tag>
-          </template>
-        </el-table-column>
-        <!-- 下载开始时间 -->
-        <el-table-column
-          prop="DownloadStartTime"
-          min-width="130"
-          :label="$t('trials:downloadMonitor:table:downloadStartTime')"
-          show-overflow-tooltip
-          sortable="custom"
-        />
-        <!-- 下载结束时间 -->
-        <el-table-column
-          prop="DownloadEndTime"
-          min-width="130"
-          :label="$t('trials:downloadMonitor:table:downloadEndTime')"
-          show-overflow-tooltip
-          sortable="custom"
-        />
-      </el-table>
-      <!-- 分页组件 -->
-      <pagination
-        class="page"
-        :total="total"
-        :page.sync="searchData.PageIndex"
-        :limit.sync="searchData.PageSize"
-        @pagination="getList"
-      />
-    </template>
-  </BaseContainer>
-</template>
-
-<script>
-import { getTrialDownloadList } from '@/api/load'
-import Pagination from '@/components/Pagination'
-import BaseContainer from '@/components/BaseContainer'
-const searchDataDefault = () => {
-  return {
-    SortField: 'DownloadStartTime',
-    Asc: false,
-    PageIndex: 1,
-    PageSize: 20,
-    TrialId: '',
-    IsSuccess: null,
-    StudyCode: null,
-    DownloadStartTime: null,
-    DownloadEndTime: null,
-    Ip: null,
-    ImageType: null,
-    UserType: null,
-  }
-}
-export default {
-  components: { BaseContainer, Pagination },
-  data() {
-    return {
-      list: [],
-      total: 0,
-      loading: false,
-      searchData: searchDataDefault(),
-      datetimerange: [],
-    }
-  },
-  mounted() {
-    this.getList()
-  },
-  methods: {
-    getList() {
-      this.loading = true
-      this.searchData.TrialId = this.$route.query.trialId
-      getTrialDownloadList(this.searchData)
-        .then((res) => {
-          this.list = res.Result.CurrentPageData
-          this.total = res.Result.TotalCount
-          this.loading = false
-        })
-        .catch(() => {
-          this.loading = false
-        })
-    },
-    // 获取site下拉框数据
-    getSite() {
-      getTrialSiteSelect(this.trialId).then((res) => {
-        this.siteOptions = res.Result
-      })
-    },
-    // 获取访视下拉框数据
-    getVisitPlanOptions() {
-      getTrialVisitStageSelect(this.trialId).then((res) => {
-        this.visitPlanOptions = res.Result
-      })
-    },
-    fileSizeFormatter(size) {
-      if (!size) return
-      return (size / Math.pow(1024, 2)).toFixed(3) + 'M'
-    },
-    handleReset() {
-      this.searchData = searchDataDefault()
-      this.datetimerange = []
-      this.getList()
-    },
-    handleSearch() {
-      this.searchData.PageIndex = 1
-      this.getList()
-    },
-    // 排序
-    handleSortByColumn(column) {
-      if (column.order === 'ascending') {
-        this.searchData.Asc = true
-      } else {
-        this.searchData.Asc = false
-      }
-      this.searchData.SortField = column.prop
-      this.getList()
-    },
-    handleDatetimeChange(val) {
-      if (val) {
-        this.searchData.DownloadStartTime = val[0]
-        this.searchData.DownloadEndTime = val[1]
-      } else {
-        this.searchData.DownloadStartTime = ''
-        this.searchData.DownloadEndTime = ''
-      }
-    },
-  },
-}
-</script>

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

@@ -1253,7 +1253,7 @@ 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 { downLoadFile } from '@/utils/stream.js'
-import { getCRCUploadedStudyInfo, downloadImageSuccess } from '@/api/load.js'
+import { getCRCUploadedStudyInfo } from '@/api/load.js'
 import store from '@/store'
 export default {
   name: 'QualityAssurance',
@@ -1370,7 +1370,6 @@ export default {
       downloading: false,
       selectTableDicom: [], // 选中的dicom数据
       selectTableNonedicom: [], // 选中的非dicom数据
-      downloadId: null,
     }
   },
   async mounted() {
@@ -1428,7 +1427,6 @@ export default {
         let res = await getCRCUploadedStudyInfo(data)
         this.downloading = false
         if (res.IsSuccess) {
-          this.downloadId = res.OtherInfo
           this.downloadImage(res.Result, type)
         }
       } catch (err) {
@@ -1440,14 +1438,10 @@ export default {
     async downloadImage(data, type) {
       try {
         let { files, name, fileType } = this.formatDownloadFile(data, type)
-        let res = null
         if (fileType === 'list') {
-          res = await downLoadFile(files, name, 'zip')
+          await downLoadFile(files, name, 'zip')
         } else {
-          res = await downLoadFile(files, name)
+          await downLoadFile(files, name)
-        }
-        if (res && this.downloadId) {
-          this.downloadImageSuccess()
         }
       } catch (err) {
         console.log(err)
@@ -1473,7 +1467,7 @@ export default {
                     name: `${data.SubjectCode}_${data.VisitName}_${this.$fd(
                       'IsDicom',
                       true
-                    )}/${study.StudyCode}_${study.StudyTime.split(' ')[0]}_${
+                    )}/${study.StudyCode}_${study.StudyTime.split(" ")[0]}_${
                       series.Modality
                     }/${fileName}`,
                     url: this.OSSclientConfig.basePath + instance.Path,
@@ -1510,9 +1504,9 @@ export default {
                 name: `${data.SubjectCode}_${data.VisitName}_${this.$fd(
                   'IsDicom',
                   true
-                )}/${study.StudyCode}_${study.ImageDate.split(' ')[0]}_${
+                )}/${study.StudyCode}_${study.ImageDate.split(" ")[0]}_${study.Modality}/${
-                  study.Modality
+                  item.FileName
-                }/${item.FileName}`,
+                }`,
                 url: this.OSSclientConfig.basePath + item.Path,
               }
               files.push(obj)
@@ -1522,17 +1516,6 @@ export default {
       }
       return { files, name, fileType: 'list' }
     },
-    // 影像下载成功确认
-    async downloadImageSuccess() {
-      try {
-        let params = {
-          TrialImageDownloadId: this.downloadId,
-        }
-        await downloadImageSuccess(params)
-      } catch (err) {
-        console.log(err)
-      }
-    },
     // 获取QC界面基本信息
     getQCInfo() {
       this.loading = true
@@ -1660,9 +1643,7 @@ export default {
             var str = `${item.keyName}<br>`
             if (item.keyValue) {
               // 问题总结
-              str = `${str}${this.$t(
+              str = `${str}${this.$t('trials:audit:form:questionSummary')}：<br><div style='margin-left:20px'>${item.keyValue}</div>`
-                'trials:audit:form:questionSummary'
-              )}：<br>${item.keyValue}<br>`
             }
             if (item.actionContent) {
               // 行动事项