XCKJ
/
irc_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

阅片人简历

uat_us
熊飞 2024-01-30 10:32:06 +08:00
parent d745ad7318
commit 8f4878c191
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/utils/oss.js
View File

@ -24,6 +24,7 @@ async function ossGenerateSTS() {
switch (res.Result.ObjectStoreUse) { switch (res.Result.ObjectStoreUse) {
case 'AliyunOSS': case 'AliyunOSS':
Vue.prototype.OSSclientConfig.bucket = Vue.prototype.OSSclientConfig.bucketName Vue.prototype.OSSclientConfig.bucket = Vue.prototype.OSSclientConfig.bucketName
Vue.prototype.OSSclientConfig.timeout = 10 * 60 * 1000
let OSSclient = new OSS(Vue.prototype.OSSclientConfig) let OSSclient = new OSS(Vue.prototype.OSSclientConfig)
Vue.prototype.OSSclient = { Vue.prototype.OSSclient = {
put: function (objectName, object) { put: function (objectName, object) {

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

@ -290,7 +290,9 @@
show-overflow-tooltip show-overflow-tooltip
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="!scope.row.dicomInfo.failedFileCount">{{$t('trials:uploadDicomList:table:status1')}}</span> <span v-if="!scope.row.dicomInfo.failedFileCount">
{{$t('trials:uploadDicomList:table:status1')}}</span>
<span style="color:#409eff" v-else-if="!scope.row.dicomInfo.failedFileCount && scope.row.dicomInfo.isInit && btnLoading">{{$t('trials:uploadDicomList:table:status2')}}</span>
<span style="color:#409eff" v-else-if="scope.row.dicomInfo.failedFileCount < scope.row.dicomInfo.fileCount && !scope.row.uploadState.record">{{$t('trials:uploadDicomList:table:status2')}}</span> <span style="color:#409eff" v-else-if="scope.row.dicomInfo.failedFileCount < scope.row.dicomInfo.fileCount && !scope.row.uploadState.record">{{$t('trials:uploadDicomList:table:status2')}}</span>
<span style="color:#2cc368" v-else-if="scope.row.dicomInfo.failedFileCount === scope.row.dicomInfo.fileCount">{{$t('trials:uploadDicomList:table:status3')}}</span> <span style="color:#2cc368" v-else-if="scope.row.dicomInfo.failedFileCount === scope.row.dicomInfo.fileCount">{{$t('trials:uploadDicomList:table:status3')}}</span>
<span style="color:#f66" v-else-if="scope.row.uploadState.record && scope.row.uploadState.record.fileCount === 0">{{$t('trials:uploadDicomList:table:status5')}}</span> <span style="color:#f66" v-else-if="scope.row.uploadState.record && scope.row.uploadState.record.fileCount === 0">{{$t('trials:uploadDicomList:table:status5')}}</span>
@ -728,7 +730,7 @@ export default {
studyTime = time ? `${date} ${time}` : `${date} 00:00:00` studyTime = time ? `${date} ${time}` : `${date} 00:00:00`
} }
const patientNameElement = data.elements.x00100010; const patientNameElement = data.elements.x00100010;
const patientNameBytes = new Uint8Array(data.byteArray.buffer, patientNameElement.dataOffset, patientNameElement.length); const patientNameBytes = new Uint8Array(data.byteArray.buffer, patientNameElement ? patientNameElement.dataOffset : 0, patientNameElement ? patientNameElement.length : 0);
const patientNameStr = convertBytes(data.string('x00080005'), patientNameBytes); const patientNameStr = convertBytes(data.string('x00080005'), patientNameBytes);
scope.uploadQueues.push({ scope.uploadQueues.push({
studyIndex: studyIndex, studyIndex: studyIndex,
@ -813,7 +815,7 @@ export default {
seriesTime = time ? `${date} ${time}` : `${date} 00:00:00` seriesTime = time ? `${date} ${time}` : `${date} 00:00:00`
} }
const seriesDescriptionElement = data.elements.x0008103e; const seriesDescriptionElement = data.elements.x0008103e;
const seriesDescriptionBytes = new Uint8Array(data.byteArray.buffer, seriesDescriptionElement.dataOffset, seriesDescriptionElement.length); const seriesDescriptionBytes = new Uint8Array(data.byteArray.buffer, seriesDescriptionElement ? seriesDescriptionElement.dataOffset : 0, seriesDescriptionElement ? seriesDescriptionElement.length : 0);
const seriesDescriptionStr = convertBytes(data.string('x00080005'), seriesDescriptionBytes); const seriesDescriptionStr = convertBytes(data.string('x00080005'), seriesDescriptionBytes);
seriesItem = { seriesItem = {
seriesUid: seriesUid, seriesUid: seriesUid,
@ -1099,6 +1101,7 @@ export default {
IsDicomReUpload: scope.uploadQueues[index].uploadState.AllowReUpload IsDicomReUpload: scope.uploadQueues[index].uploadState.AllowReUpload
}).then(async res => { }).then(async res => {
scope.uploadQueues[index].dicomInfo.failedFileCount = 0 scope.uploadQueues[index].dicomInfo.failedFileCount = 0
scope.uploadQueues[index].isInit = true
let dicomInfo = scope.uploadQueues[index].dicomInfo let dicomInfo = scope.uploadQueues[index].dicomInfo
let seriesNum = scope.uploadQueues[index].seriesList.length let seriesNum = scope.uploadQueues[index].seriesList.length
let fileNum = scope.uploadQueues[index].fileList.length let fileNum = scope.uploadQueues[index].fileList.length
@ -1321,8 +1324,6 @@ export default {
Uploaded: [], Uploaded: [],
FileCount: 0 FileCount: 0
} }
// 删错了
let dicomInfo = scope.uploadQueues[index].dicomInfo
let fileList = scope.uploadQueues[index].fileList let fileList = scope.uploadQueues[index].fileList
fileList.forEach(v => { fileList.forEach(v => {
Record.Failed.push(v.webkitRelativePath) Record.Failed.push(v.webkitRelativePath)