Compare commits

...

6 Commits

Author SHA1 Message Date
DESKTOP-6C3NK6N\WXS bde8a7d572 1 2024-08-09 13:12:16 +08:00
DESKTOP-6C3NK6N\WXS 267ee60fc2 Merge branch 'uat' into uat_us 2024-08-09 13:11:36 +08:00
DESKTOP-6C3NK6N\WXS 08710d78d1 临床数据名称国际化
continuous-integration/drone/push Build is running Details
2024-08-09 13:08:52 +08:00
caiyiling 0432d73dc3 Merge branch 'uat' of https://gitea.frp.extimaging.com/XCKJ/irc_web into uat
continuous-integration/drone/push Build is running Details
2024-08-09 13:08:43 +08:00
caiyiling 67d995d180 阅片类型编辑样式修改 2024-08-09 13:04:47 +08:00
DESKTOP-6C3NK6N\WXS de313e9b52 去除锁屏二次验证
continuous-integration/drone/push Build is passing Details
2024-08-09 11:44:32 +08:00
4 changed files with 34 additions and 30 deletions

View File

@ -2,7 +2,7 @@
ENV = 'usa' ENV = 'usa'
NODE_ENV = 'usa' NODE_ENV = 'usa'
# base public path # base public path
VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-08-08/' VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-08-09/'
# 是否开启登陆限制 true:是 false:否 # 是否开启登陆限制 true:是 false:否
VUE_APP_LOGIN_FOR_PERMISSION = true VUE_APP_LOGIN_FOR_PERMISSION = true

View File

@ -440,22 +440,22 @@ async function VueInit() {
done() done()
}, 500) }, 500)
} }
if (eval(process.env.VUE_APP_LOCK_FOR_PERMISSION_MFA)) { // if (eval(process.env.VUE_APP_LOCK_FOR_PERMISSION_MFA)) {
sendMFAEmail({ UserId: my_userid, MfaType: 1 }).then((res) => { // sendMFAEmail({ UserId: my_userid, MfaType: 1 }).then((res) => {
done(); // done();
Vue.prototype.$MFA({ // Vue.prototype.$MFA({
status: "lock", // status: "lock",
UserId: my_userid, // UserId: my_userid,
EMail: res.Result, // EMail: res.Result,
username: my_username, // username: my_username,
callBack: () => { // callBack: () => {
closeLock(_vm) // closeLock(_vm)
}, // },
}) // })
}) // })
} else { // } else {
closeLock(_vm) closeLock(_vm)
} // }
} else { } else {
// console.log(111) // console.log(111)

View File

@ -272,20 +272,22 @@
</el-select> </el-select>
</template> </template>
<template slot="dialog-footer"> <template slot="dialog-footer">
<el-button <div style="margin-top:30px;">
<el-button
:disabled="readingCategory_model.btnLoading" :disabled="readingCategory_model.btnLoading"
type="primary" type="primary"
@click="readingCategory_model.visible = false" @click="readingCategory_model.visible = false"
> >
{{ $t('common:button:cancel') }} {{ $t('common:button:cancel') }}
</el-button> </el-button>
<el-button <el-button
type="primary" type="primary"
:loading="readingCategory_model.btnLoading" :loading="readingCategory_model.btnLoading"
@click="handleUpdateReadingCategory" @click="handleUpdateReadingCategory"
> >
{{ $t('common:button:save') }} {{ $t('common:button:save') }}
</el-button> </el-button>
</div>
</template> </template>
</base-model> </base-model>
<!-- 修改医生状态 --> <!-- 修改医生状态 -->

View File

@ -16,10 +16,12 @@
<el-input <el-input
v-model="form.ClinicalDataSetEnName" v-model="form.ClinicalDataSetEnName"
:disabled="data.IsFromSystemData === true" :disabled="data.IsFromSystemData === true"
@input="form.ClinicalDataSetName = form.ClinicalDataSetEnName"
@blur="form.ClinicalDataSetName = form.ClinicalDataSetEnName"
/> />
</el-form-item> </el-form-item>
<!-- 临床数据名称 --> <!-- 临床数据名称 -->
<el-form-item <!-- <el-form-item
:label="$t('trials:processCfg:title:clinicalDataName')+ 'CN'" :label="$t('trials:processCfg:title:clinicalDataName')+ 'CN'"
prop="ClinicalDataSetName" prop="ClinicalDataSetName"
> >
@ -27,7 +29,7 @@
v-model="form.ClinicalDataSetName" v-model="form.ClinicalDataSetName"
:disabled="data.IsFromSystemData === true" :disabled="data.IsFromSystemData === true"
/> />
</el-form-item> </el-form-item> -->
<!-- 上传人 --> <!-- 上传人 -->
<el-form-item <el-form-item
:label="$t('trials:processCfg:title:uploader')" :label="$t('trials:processCfg:title:uploader')"