{{ $t('dictionary:email:title:title1') }}
@@ -630,3 +410,8 @@ export default {
},
}
+
diff --git a/src/views/forgetpassword/index.vue b/src/views/forgetpassword/index.vue
index 59f95dde..7b3fa85b 100644
--- a/src/views/forgetpassword/index.vue
+++ b/src/views/forgetpassword/index.vue
@@ -9,71 +9,36 @@
-
+
-
+
-
+
-
+
- {{ sendTitle }}
+ {{ sendTitle }}
-
+
{{ $t('passwordReset:button:verify') }}
-
+
@@ -105,27 +70,17 @@
-->
-
+
-
+
-
+
@@ -135,12 +90,7 @@
{{ $t('passwordReset:button:cancel') }}
-
+
{{ $t('passwordReset:button:submit') }}
@@ -388,10 +338,14 @@ export default {
}
},
onCancel() {
- this.$refs['resetForm'].resetFields()
+ // this.$refs['resetForm'].resetFields()
Object.keys(this.form).forEach((key) => {
this.form[key] = ''
})
+ this.sendDisabled = false
+ this.sendTitle = this.$t('passwordReset:button:send')
+ countdown = 60
+ clearTimeout(timer)
this.active = 0
},
goBack() {
@@ -404,12 +358,14 @@ export default {
.reset-wrapper {
padding: 20px;
}
+
.reset-wrapper .el-page-header {
line-height: 50px;
border: 1px solid #ebeef5;
border-radius: 4px;
background-color: #fff;
}
+
.reset-wrapper .box-wrapper {
width: 700px;
margin: 20px auto;
@@ -425,6 +381,7 @@ export default {
.is-error.my_new_pwd {
margin-bottom: 45px;
}
+
.flexBox {
display: flex;
justify-content: center;
diff --git a/src/views/system/login-log/index.vue b/src/views/system/login-log/index.vue
index f3a775dc..97bca316 100644
--- a/src/views/system/login-log/index.vue
+++ b/src/views/system/login-log/index.vue
@@ -2,152 +2,66 @@
-
-
-
+
+
+
-
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
+
{{ $t('common:button:search') }}
-
+
{{ $t('common:button:reset') }}
-
+
-
-
-
+ ">
+
+
{{ scope.$index + 1 }}
-
+
{{ $fd('UserOptType', scope.row.OptType) }}
-
-
+
+
-
-
+
+
-
+
-
+
-
+
{{ $t('system:loginLog:message:detail') }}
-
+
@@ -241,6 +123,7 @@ import moment from 'moment'
const searchDataDefault = () => {
return {
OptType: null,
+ OptTypeList: [],
Ip: '',
LoginFaildName: '',
LoginUserName: '',
@@ -334,25 +217,30 @@ export default {
display: flex;
padding: 10px;
border-radius: 5px;
+
.left {
display: flex;
flex-direction: column;
width: 0;
flex-grow: 4;
+
// border-right: 1px solid #ccc;
.filter-container {
display: flex;
align-items: center;
margin: 5px;
}
+
.data-table {
flex: 1;
padding: 5px 0px;
}
+
.pagination-container {
text-align: right;
}
}
+
.icon-i {
color: #f56c6c;
cursor: pointer;
diff --git a/src/views/trials/trials-list/index.vue b/src/views/trials/trials-list/index.vue
index 539b91a7..b2005121 100644
--- a/src/views/trials/trials-list/index.vue
+++ b/src/views/trials/trials-list/index.vue
@@ -9,64 +9,28 @@
-
+
-
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
@@ -75,33 +39,19 @@
{{ $t('common:button:search') }}
-
+
{{ $t('common:button:reset') }}
-
+
{{ $t('common:button:export') }}
-
+
{{ $t('common:button:new') }}
@@ -112,190 +62,88 @@
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
-
+
+
- Search
+ Search
Reset
Back
@@ -305,219 +153,89 @@
-
+
-
-
+
+
-
-
-
+
+
+
- {{ $fd('TrialStatusEnum', scope.row.TrialStatusStr) }}
- {{ $fd('TrialStatusEnum', scope.row.TrialStatusStr) }}
- {{ $fd('TrialStatusEnum', scope.row.TrialStatusStr) }}
- {{ $fd('TrialStatusEnum', scope.row.TrialStatusStr) }}
+ {{ $fd('TrialStatusEnum',
+ scope.row.TrialStatusStr) }}
+ {{ $fd('TrialStatusEnum',
+ scope.row.TrialStatusStr) }}
+ {{ $fd('TrialStatusEnum',
+ scope.row.TrialStatusStr) }}
+ {{ $fd('TrialStatusEnum',
+ scope.row.TrialStatusStr) }}
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
{{ scope.row.IR_ReadingCriterionList.join(', ') }}
-
-
-
-
+
+
+
+
{{ scope.row.IR_PMEmailList.join(', ') }}
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
@@ -661,61 +315,26 @@
-
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -897,7 +516,7 @@ export default {
this.$confirm(res.ErrorMessage, {
type: 'warning',
showCancelButton: false,
- callback: (action) => {},
+ callback: (action) => { },
})
}
})
@@ -922,7 +541,7 @@ export default {
this.currentRow = { ...row }
this.abandonTrial()
})
- .catch(() => {})
+ .catch(() => { })
},
// 废除项目
abandonTrial() {
@@ -954,7 +573,10 @@ export default {
!(
this.hasPermi(['role:qa']) ||
this.hasPermi(['role:ea']) ||
- this.hasPermi(['role:pm'])
+ this.hasPermi(['role:pm']) ||
+ hasPermi(['role:op']) ||
+ hasPermi(['role:dev']) ||
+ hasPermi(['role:admin'])
)
) {
return
diff --git a/src/views/trials/trials-panel/trial-summary/login-log/index.vue b/src/views/trials/trials-panel/trial-summary/login-log/index.vue
index 3f097378..94c82162 100644
--- a/src/views/trials/trials-panel/trial-summary/login-log/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/login-log/index.vue
@@ -2,31 +2,14 @@
-
-
-
+
+
+
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
-
+ :end-placeholder="$t('trials:loginLog:table:endTime')" value-format="yyyy-MM-dd HH:mm:ss"
+ @change="handleDatetimeChange" />
{{ $t('common:button:search') }}
-
+
{{ $t('common:button:reset') }}
-
+
-
+
{{ $fd('UserOptType', scope.row.OptType) }}
-
+
-
-
+
+
-
+
-
+
-
+
{{ $t('trials:loginLog:message:detail') }}
-
+
-
+
@@ -247,6 +140,7 @@ const searchDataDefault = () => {
return {
TrialId: '',
OptType: null,
+ OptTypeList: [],
Ip: '',
LoginFaildName: '',
LoginUserName: '',
diff --git a/src/views/trials/trials-panel/trial-summary/trial-document/components/uploadFiles.vue b/src/views/trials/trials-panel/trial-summary/trial-document/components/uploadFiles.vue
index f493caf8..7a61f8f9 100644
--- a/src/views/trials/trials-panel/trial-summary/trial-document/components/uploadFiles.vue
+++ b/src/views/trials/trials-panel/trial-summary/trial-document/components/uploadFiles.vue
@@ -10,43 +10,20 @@
)
}}
@@ -265,11 +200,11 @@ export default {
type: extendName.split('.')[1],
status: 0,
file: files[i],
- id: `${files[i].lastModified}${
- files[i].name
- }${new Date().getTime()}${i + 1}`,
+ id: `${files[i].lastModified}${files[i].name
+ }${new Date().getTime()}${i + 1}`,
fileType: files[i].type,
uploadFileSize: 0,
+ webkitRelativePath: files[i].webkitRelativePath
}
this.fileList.push(obj)
this.$refs.filesTable.toggleRowSelection(obj, true)
@@ -300,7 +235,7 @@ export default {
)
}
})
- .catch(() => {})
+ .catch(() => { })
},
// 开始上传文件
async beginUpload() {
@@ -348,7 +283,8 @@ export default {
FileName: file.name,
FilePath: this.$getObjectName(res.url),
FileSize: file.size,
- FileFormat: fileType,
+ FileFormat: fileType.split('.')[1],
+ catalogue: file.webkitRelativePath
})
let flag = arr.every((item) => item.status === 2)
if (flag) {
@@ -390,7 +326,7 @@ export default {
(percentage, checkpoint, lastPer) => {
item.uploadFileSize += checkpoint.size * (percentage - lastPer)
if (item.uploadFileSize > file.fileSize) {
- item.uploadFileSize = file.fileSize
+ item.uploadFileSize = file.fileSize > 0 ? file.fileSize : 1
}
}
)
@@ -431,7 +367,6 @@ export default {
} else {
this.fileInput.accept = this.faccept.join(',')
}
- console.log(this.fileInput)
this.fileInput.click()
},
},
@@ -481,6 +416,7 @@ export default {
background: #428bca;
border-color: #428bca;
color: #fff;
+
.select-file {
height: 30px;
width: 90px;
@@ -491,6 +427,7 @@ export default {
opacity: 0;
font-size: 0;
}
+
.btn-select {
//给显示在页面上的按钮写样式
width: 90px;
diff --git a/src/views/trials/trials-panel/trial-summary/upload-monitor/index.vue b/src/views/trials/trials-panel/trial-summary/upload-monitor/index.vue
index 9b604fdf..572734d5 100644
--- a/src/views/trials/trials-panel/trial-summary/upload-monitor/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/upload-monitor/index.vue
@@ -15,7 +15,7 @@
v-for="(item, index) of siteOptions"
:key="index"
:label="item.TrialSiteCode"
- :value="item.SiteId"
+ :value="item.TrialSiteId"
/>
diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue
index 281f50e2..e1dec7a7 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue
@@ -2,93 +2,40 @@