上传对象名加上时间戳
continuous-integration/drone/push Build is passing Details

uat_us
熊飞 2024-01-22 14:24:15 +08:00
parent 7ff424ad65
commit bd7f1dea2d
16 changed files with 34 additions and 29 deletions

View File

@ -29,7 +29,9 @@ async function ossGenerateSTS() {
put: function (objectName, object) { put: function (objectName, object) {
return new Promise(async (resolve, reject) => { return new Promise(async (resolve, reject) => {
try { try {
objectName = objectName + '_' + new Date().getTime() var objectItem = objectName.split('/')
objectItem[objectItem.length - 1] = new Date().getTime() + '_' + objectItem[objectItem.length - 1]
objectName = objectItem.join('/')
let res = await OSSclient.put(objectName, object) let res = await OSSclient.put(objectName, object)
if (res && res.url) { if (res && res.url) {
resolve({ resolve({

View File

@ -150,7 +150,7 @@
<el-dialog <el-dialog
v-if="previewVisible" v-if="previewVisible"
:visible.sync="previewVisible" :visible.sync="previewVisible"
title="预览" :title="$t('common:button:preview')"
:fullscreen="true" :fullscreen="true"
append-to-body append-to-body
custom-class="base-dialog-wrapper" custom-class="base-dialog-wrapper"

View File

@ -235,7 +235,7 @@ export default {
rowData: {}, rowData: {},
activeName: '0', activeName: '0',
addOrEdit: { visible: false, title: '' }, addOrEdit: { visible: false, title: '' },
preview: { visible: false, title: 'eCRF预览' }, preview: { visible: false, title: 'eCRF' + this.$t('common:button:preview') },
config: { visible: false, title: '' } config: { visible: false, title: '' }
} }
}, },

View File

@ -288,7 +288,7 @@ export default {
rowData: {}, rowData: {},
activeName: '0', activeName: '0',
addOrEdit: { visible: false, title: '' }, addOrEdit: { visible: false, title: '' },
preview: { visible: false, title: 'eCRF预览' }, preview: { visible: false, title: 'eCRF' + this.$t('common:button:preview') },
config: { visible: false, title: '' } config: { visible: false, title: '' }
} }
}, },

View File

@ -187,7 +187,7 @@ export default {
loading: false, loading: false,
rowData: {}, rowData: {},
model_cfg: { visible: false, showClose: true, width: '600px', title: '' }, model_cfg: { visible: false, showClose: true, width: '600px', title: '' },
preview: { visible: false, title: '预览' } preview: { visible: false, title: this.$t('common:button:preview') }
} }
}, },
mounted() { mounted() {

View File

@ -66,7 +66,7 @@
<!-- 账号信息 --> <!-- 账号信息 -->
{{ $t('trials:trials-myinfo:title:accountInfo') }} {{ $t('trials:trials-myinfo:title:accountInfo') }}
</div> </div>
<el-form label-position="right" label-width="150px"> <el-form label-position="right" label-width="180px">
<!-- 用户名 --> <!-- 用户名 -->
<el-form-item :label="$t('trials:trials-myinfo:form:userName')" style="margin-bottom: 5px;" prop="UserName"> <el-form-item :label="$t('trials:trials-myinfo:form:userName')" style="margin-bottom: 5px;" prop="UserName">
<span>{{ user.UserName }}</span> <span>{{ user.UserName }}</span>
@ -111,7 +111,7 @@
<!-- 修改密码 --> <!-- 修改密码 -->
{{ $t('trials:trials-myinfo:title:updatePaasord') }} {{ $t('trials:trials-myinfo:title:updatePaasord') }}
</div> </div>
<el-form ref="passwordForm" label-position="right" :model="password" :rules="passwordFormRules" label-width="150px"> <el-form ref="passwordForm" label-position="right" :model="password" :rules="passwordFormRules" label-width="180px">
<!-- 旧密码 --> <!-- 旧密码 -->
<el-form-item :label="$t('recompose:form:oldPassword')" prop="OldPassWord"> <el-form-item :label="$t('recompose:form:oldPassword')" prop="OldPassWord">
<el-input v-model="password.OldPassWord" type="password" show-password auto-complete="new-password" :placeholder="$t('recompose:form:oldPassword')"/> <el-input v-model="password.OldPassWord" type="password" show-password auto-complete="new-password" :placeholder="$t('recompose:form:oldPassword')"/>

View File

@ -31,14 +31,7 @@
sortable="custom" sortable="custom"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<router-link <el-button type="text" @click="go(`/trialsResume?doctorId=${scope.row.DoctorId}&token=${token}`)">{{ scope.row.LastName }} / {{ scope.row.FirstName }}</el-button>
style="color: #428bca;"
tag="a"
:to="{
path: `/trialsResume?doctorId=${scope.row.DoctorId}&token=${token}`,
}"
target="_blank"
>{{ scope.row.LastName }} / {{ scope.row.FirstName }}</router-link>
</template> </template>
</el-table-column> </el-table-column>
<!-- Name CN --> <!-- Name CN -->
@ -445,6 +438,9 @@ export default {
this.initPage() this.initPage()
}, },
methods: { methods: {
go(path) {
window.open(path)
},
beforeUpload() { beforeUpload() {
if (this.fileList.length > 0) { if (this.fileList.length > 0) {
// 1 // 1

View File

@ -769,10 +769,11 @@ export default {
handleBeforeUpload(file, accept) { handleBeforeUpload(file, accept) {
// //
console.log('handleBeforeUpload', file) console.log('handleBeforeUpload', file)
if (this.checkFileSuffix(file.name, accept)) { if (this.checkFileSuffix(file.name, accept) || accept === '-1') {
return true return true
} else { } else {
this.$alert(`必须是 ${accept} 格式`) const msg = this.$t('trials:adReview:title:msg4').replace('xxx', accept)
this.$alert(msg)
return false return false
} }
console.log(file) console.log(file)

View File

@ -235,9 +235,9 @@ export default {
mounted() { mounted() {
if (this.question.Type === 'upload') { if (this.question.Type === 'upload') {
if (this.questionForm[this.question.Id]) { if (this.questionForm[this.question.Id]) {
this.accept = this.question.Accept
this.urls = this.questionForm[this.question.Id].split('|') this.urls = this.questionForm[this.question.Id].split('|')
this.fileList = [] this.fileList = []
this.urls.map(url => { this.urls.map(url => {
this.fileList.push({ name: '', url: `/api/${url}` }) this.fileList.push({ name: '', url: `/api/${url}` })
}) })
@ -285,11 +285,13 @@ export default {
// this.fileList = [] // this.fileList = []
return true return true
} else { } else {
this.$alert(`必须是 ${this.accept} 格式`) const msg = this.$t('trials:adReview:title:msg4').replace('xxx', this.accept)
this.$alert(msg)
return false return false
} }
}, },
checkFileSuffix(fileName) { checkFileSuffix(fileName) {
console.log(this.accept)
var index = fileName.lastIndexOf('.') var index = fileName.lastIndexOf('.')
var suffix = fileName.substring(index + 1, fileName.length) var suffix = fileName.substring(index + 1, fileName.length)
if (this.accept.toLocaleLowerCase().search(suffix.toLocaleLowerCase()) === -1) { if (this.accept.toLocaleLowerCase().search(suffix.toLocaleLowerCase()) === -1) {

View File

@ -268,7 +268,7 @@
width="1200px" width="1200px"
:close-on-click-modal="false" :close-on-click-modal="false"
custom-class="base-dialog-wrapper" custom-class="base-dialog-wrapper"
:title="'邮件模版'" :title="$t('trials:emailManageCfg:button:Default')"
> >
<div class="base-dialog-body"> <div class="base-dialog-body">
<DefaultQS @getList="getList" :is-distinguish-criteria="isDistinguishCriteria" @close="addVisible = false" /> <DefaultQS @getList="getList" :is-distinguish-criteria="isDistinguishCriteria" @close="addVisible = false" />

View File

@ -188,7 +188,7 @@ export default {
loading: false, loading: false,
addOrEdit: { visible: false, title: '' }, addOrEdit: { visible: false, title: '' },
questions: { visible: false, title: '阅片问题' }, questions: { visible: false, title: '阅片问题' },
preview: { visible: false, title: 'eCRF预览' }, preview: { visible: false, title: 'eCRF' + this.$t('common:button:preview') },
rowData: {}, rowData: {},
tblList: [] tblList: []
} }

View File

@ -33,7 +33,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<div> <div>
<el-button size="mini" type="primary" @click="preview.visible = true">预览</el-button> <el-button size="mini" type="primary" @click="preview.visible = true">{{ $t('common:button:preview') }}</el-button>
<el-button <el-button
v-if="!data.IsCompleteConfig && ! data.IsSystemData" v-if="!data.IsCompleteConfig && ! data.IsSystemData"
size="mini" size="mini"
@ -216,7 +216,7 @@ export default {
loading: false, loading: false,
rowData: {}, rowData: {},
addOrEdit: { visible: false, title: '' }, addOrEdit: { visible: false, title: '' },
preview: { visible: false, title: 'eCRF预览' } preview: { visible: false, title: 'eCRF' + this.$t('common:button:preview') }
} }
}, },
mounted() { mounted() {

View File

@ -1095,7 +1095,7 @@ export default {
selectClinicalDataArr: [], selectClinicalDataArr: [],
selectedCD: [], selectedCD: [],
QuestionConfigVisible: { visible: false, title: '' }, QuestionConfigVisible: { visible: false, title: '' },
preview: { visible: false, title: '预览' }, preview: { visible: false, title: this.$t('common:button:preview') },
} }
}, },
mounted() { mounted() {

View File

@ -180,11 +180,11 @@
min-width="120" min-width="120"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip placement="top"> <el-tooltip placement="top" v-key="scope.row.Id" v-if="scope.row.IsHaveUploadFailed">
<div slot="content"> <div slot="content">
{{ $t('trials:uploadDicomList:table:status4') }} {{ $t('trials:uploadDicomList:table:status4') }}
</div> </div>
<span class="el-icon-warning" style="color: #cbb024;cursor: pointer" v-if="scope.row.IsHaveUploadFailed"></span> <span class="el-icon-warning" style="color: #cbb024;cursor: pointer"></span>
</el-tooltip> </el-tooltip>
<span style="margin: 0 4px">{{ scope.row.SubjectCode }}</span> <span style="margin: 0 4px">{{ scope.row.SubjectCode }}</span>
<!-- --> <!-- -->

View File

@ -1331,7 +1331,9 @@ export default {
}) })
if (!isgo) { if (!isgo) {
// `${isgoList.toString()}` // `${isgoList.toString()}`
this.$alert(this.$t('trials:qcQuality:title:title1').replace('xxx', isgoList.toString())) this.$confirm(this.$t('trials:qcQuality:title:title1').replace('xxx', isgoList.toString()), '',{
showCancelButton: false
})
return return
} }
} }
@ -1410,7 +1412,9 @@ export default {
SubjectId: this.data.SubjectId SubjectId: this.data.SubjectId
}).then(res => { }).then(res => {
if (res.Result) { if (res.Result) {
this.$confirm(this.$t('trials:qcQuality:title:title2')).then(() => { this.$confirm(this.$t('trials:qcQuality:title:title2', '', {
showCancelButton: false
})).then(() => {
collectNextIQCQuality({ collectNextIQCQuality({
trialId: this.trialId, trialId: this.trialId,
SubjectId: this.data.SubjectId SubjectId: this.data.SubjectId

View File

@ -2,7 +2,7 @@
<div class="wrapper"> <div class="wrapper">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<h3>{{$t('trials:audit:tab:clinicalData')}}{{$t('common:button:confirm')}}</h3> <h3>{{$t('trials:audit:tab:clinicalDataconfirm')}}</h3>
</el-col> </el-col>
<el-col :span="16" style="text-align:right;"> <el-col :span="16" style="text-align:right;">
<h3> <h3>