diff --git a/src/api/trials.js b/src/api/trials.js
index 3fb2d1a..fe1496c 100644
--- a/src/api/trials.js
+++ b/src/api/trials.js
@@ -3671,4 +3671,13 @@ export function visitImageBack(data) {
method: 'put',
data
})
+}
+// 阅片任务退回
+export function VisitImageDownload(data) {
+ return requestDownload({
+ url: `/download/VisitImageDownload`,
+ method: 'post',
+ responseType: 'blob',
+ data
+ })
}
\ No newline at end of file
diff --git a/src/views/trials/trials-inspection/index.vue b/src/views/trials/trials-inspection/index.vue
index 474d0f9..99ccec1 100644
--- a/src/views/trials/trials-inspection/index.vue
+++ b/src/views/trials/trials-inspection/index.vue
@@ -218,7 +218,8 @@
:close-on-click-modal="false" :close-on-press-escape="false" :before-close="handleClose">
{{ $t('dialog:sattus:downLoading') }}
-
+ {{ speed }}
+
{{ $t('dialog:sattus:ziping') }}
@@ -304,7 +305,8 @@ export default {
downloadVisible: false,
downloadType: '',
percentage: 0,
- downLoadImageCount: 0
+ downLoadImageCount: 0,
+ speed: '0KB/s'
}
},
created() {
@@ -319,6 +321,8 @@ export default {
this.percentage = 0
this.downLoadImageCount = 0
this.downloadVisible = false
+ this.speed = '0KB/s'
+ this.downloadId = null
done()
},
generate() {
@@ -604,6 +608,7 @@ export default {
this.percentage = 0
this.downLoadImageCount = 0
this.downloadVisible = false
+ this.speed = '0KB/s'
}
// if (type === 'downLoaded') {
// }
@@ -628,6 +633,7 @@ export default {
connection.start()
connection.on("ReceivProgressAsync", (id, obj) => {
console.log(obj)
+ this.speed = obj.speed
this.onUploadProgress(id, obj.sizePercent, 'downLoad')
});
}
diff --git a/src/views/trials/trials-panel/hirVisit/index.vue b/src/views/trials/trials-panel/hirVisit/index.vue
index b2d5a3d..59cdc50 100644
--- a/src/views/trials/trials-panel/hirVisit/index.vue
+++ b/src/views/trials/trials-panel/hirVisit/index.vue
@@ -5,79 +5,38 @@
-
+
-
+
-
+
-
-
+
+
-
+
-
+ :end-placeholder="$t('trials:uploadClinicalData:table:endDate')" clearable
+ :default-time="['00:00:00', '23:59:59']">
-
-
+
+
@@ -86,60 +45,39 @@
{{ $t('common:button:search') }}
-
+
{{ $t('common:button:reset') }}
+
+
+ {{ $t('trials:inspection:button:downloadImage') }}
+
-
+
+
-
+
-
+
-
+
-
+
{{
index === scope.row.PatientList.length - 1
? item.PatientIdStr
@@ -149,32 +87,18 @@
-
+
-
+
{{ $fd('Sex', scope.row.SubjectSex) }}
-
+
{{ scope.row.VisitName }}
@@ -182,39 +106,21 @@
-
+
-
+
-
+
- {{ $fd('SubmitState', Number(scope.row.SubmitState)) }}
+ {{ $fd('SubmitState', Number(scope.row.SubmitState)) }}
@@ -240,94 +146,57 @@
-->
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+ {{ $t('dialog:sattus:downLoading') }}
+ {{ speed }}
+
+
+
+ {{ $t('dialog:sattus:ziping') }}
+
+