Compare commits

...

42 Commits
main ... uat_us

Author SHA1 Message Date
wangxiaoshuang 60415e41d1 uat环境打包配置修改 2025-02-10 14:33:00 +08:00
wangxiaoshuang d7e85aa766 Merge branch 'main' into uat_us 2025-02-10 14:18:22 +08:00
wangxiaoshuang ef4d6420f3 美国uat环境配置修改,使用gzip压缩 2025-02-08 15:42:54 +08:00
wangxiaoshuang b6ffcd3d6b Merge branch 'main' into uat_us 2025-01-24 16:33:53 +08:00
wangxiaoshuang 914a6af94a LiLi简历设置去除盲化中文名称 2025-01-24 14:02:11 +08:00
wangxiaoshuang fee7e80929 打包配置修改 2025-01-24 13:57:32 +08:00
wangxiaoshuang d065b8b2c1 LiLi简历去除身份证、手机号校验,预览不显示中文简历 2025-01-24 13:56:48 +08:00
wangxiaoshuang 52445f3791 Merge branch 'main' into uat_us 2025-01-24 13:51:27 +08:00
wangxiaoshuang c4f8e08b91 LiLi环境logo 2025-01-24 10:19:56 +08:00
wangxiaoshuang f7968667f6 Merge branch 'main' into uat_us 2025-01-24 10:17:54 +08:00
wangxiaoshuang 24303b208d Merge branch 'main' into uat_us 2025-01-23 18:41:20 +08:00
wangxiaoshuang 296c251847 1 2025-01-23 18:40:25 +08:00
wangxiaoshuang 3b9e5cddb7 Merge branch 'main' into uat_us 2025-01-23 16:37:18 +08:00
wangxiaoshuang d11092338d 打包配置修改 2025-01-23 14:06:28 +08:00
wangxiaoshuang 848427ac3c Merge branch 'main' into uat_us 2025-01-23 13:03:36 +08:00
wangxiaoshuang d70cffe306 Merge branch 'main' into uat_us 2025-01-22 15:29:37 +08:00
wangxiaoshuang 0cd44bf4c6 Merge branch 'main' into uat_us 2025-01-21 15:51:22 +08:00
DESKTOP-6C3NK6N\WXS a2939e52b2 v1.7.0发布 2024-10-14 17:05:51 +08:00
DESKTOP-6C3NK6N\WXS 99e6f700c3 国际化修改 2024-09-14 10:33:27 +08:00
DESKTOP-6C3NK6N\WXS 45c50bf67d 1.6版本发布 2024-09-05 11:15:04 +08:00
DESKTOP-6C3NK6N\WXS 19e3177e23 Merge branch 'uat' into uat_us 2024-09-05 10:45:21 +08:00
DESKTOP-6C3NK6N\WXS 437010c0f7 1 2024-08-30 13:40:35 +08:00
DESKTOP-6C3NK6N\WXS 01b3d6e85e 1 2024-08-12 15:43:38 +08:00
DESKTOP-6C3NK6N\WXS cb032485e1 Merge branch 'uat' into uat_us 2024-08-12 14:39:21 +08:00
DESKTOP-6C3NK6N\WXS 4b771a9d70 1 2024-08-12 13:43:26 +08:00
DESKTOP-6C3NK6N\WXS 86321d8405 Merge branch 'uat' into uat_us 2024-08-12 13:42:50 +08:00
DESKTOP-6C3NK6N\WXS b9f3b24608 Merge branch 'uat' into uat_us 2024-08-09 13:42:57 +08:00
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 ef891857c4 1 2024-08-08 16:42:14 +08:00
DESKTOP-6C3NK6N\WXS 787f6425e0 Merge branch 'uat' into uat_us 2024-08-08 16:41:40 +08:00
DESKTOP-6C3NK6N\WXS 4929bb594d Merge branch 'uat' into uat_us 2024-08-07 18:31:12 +08:00
DESKTOP-6C3NK6N\WXS 4b9c2a073b 1 2024-08-07 18:17:17 +08:00
DESKTOP-6C3NK6N\WXS 861c7022b9 Merge branch 'uat' into uat_us 2024-08-07 18:17:05 +08:00
DESKTOP-6C3NK6N\WXS 21e0568b90 Merge branch 'uat' into uat_us 2024-08-07 17:27:36 +08:00
DESKTOP-6C3NK6N\WXS ffc9372c25 Merge branch 'uat' into uat_us 2024-08-07 16:20:52 +08:00
DESKTOP-6C3NK6N\WXS a58a6e4931 Merge branch 'uat' into uat_us 2024-08-07 15:33:24 +08:00
DESKTOP-6C3NK6N\WXS 6ac94ec1a0 Merge branch 'uat' into uat_us 2024-08-02 14:17:49 +08:00
DESKTOP-6C3NK6N\WXS ddc175961c Merge branch 'uat' into uat_us 2024-08-02 14:09:18 +08:00
DESKTOP-6C3NK6N\WXS 098a838c1e 美国测试环境 2024-08-02 09:52:14 +08:00
DESKTOP-6C3NK6N\WXS 6bb7d47511 Merge branch 'uat' into uat_us 2024-07-31 14:08:34 +08:00
DESKTOP-6C3NK6N\WXS 8e641300d2 1 2024-07-30 18:09:14 +08:00
13 changed files with 91 additions and 127 deletions

View File

@ -2,7 +2,7 @@
ENV = 'usa'
NODE_ENV = 'usa'
# base public path
VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-07-30/'
VUE_APP_BASE_PATH = 'https://d3taa4kz0xxv95.cloudfront.net/2025-01-24/'
# 是否开启登陆限制 true:是 false:否
VUE_APP_LOGIN_FOR_PERMISSION = true

View File

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

44
.env.usa_test Normal file
View File

@ -0,0 +1,44 @@
# just a flag
ENV = 'usa'
NODE_ENV = 'usa'
# base public path
VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-08-12/'
# 是否开启登陆限制 true:是 false:否
VUE_APP_LOGIN_FOR_PERMISSION = true
# 是否开启长时间无操作锁定弹框MFA验证 true:是 false:否
VUE_APP_LOCK_FOR_PERMISSION_MFA = true
# 是否开启长时间无操作锁定弹框 true:是 false:否
VUE_APP_LOCK_FOR_PERMISSION = true
# 无操作锁定弹框判断时间 单位:秒
VUE_APP_LOCK_FOR_TIME = 900
# 是否开启长时间无操作登出 true:是 false:否
VUE_APP_LOGOUT_FOR_PERMISSION = true
# 无操作锁定弹框判断时间 单位:秒
VUE_APP_LOGOUT_FOR_TIME = 1800
# 是否开启密码正则验证 true:是 false:否
VUE_APP_PASSWORD_FOR_PERMISSION = true
# 是否开启密码正则验证 true:是 false:否
VUE_APP_PASSWORD_FOR_REGULAR = ^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[-_.@^+\$!%#*?&\$~])[A-Za-z0-9-~_.@^+\$~!%#*?&]{8,32}$
# 是否开启文档签署验证 true:是 false:否
VUE_APP_WORD_FOR_PERMISSION = true
# 公司名称
VUE_APP_COMPANY_NAME = "Elevate Imaging"
# dicom文件地址
VUE_APP_DICOM_PATH = 'https://zyypacs-uat.oss-cn-shanghai.aliyuncs.com'
VUE_APP_OSS_CONFIG_REGION = 'oss-cn-shanghai'
VUE_APP_OSS_CONFIG_BUCKET = 'zyypacs-uat'
VUE_APP_OSS_PATH = '/usa/dist'

View File

@ -6,6 +6,7 @@
"build": "vue-cli-service build",
"build:prod": "vue-cli-service build --mode prod",
"build:uat": "vue-cli-service build --mode uat",
"build:usa_test": "vue-cli-service build --mode usa_test",
"build:usa": "vue-cli-service build --mode usa",
"build:usa_prod": "vue-cli-service build --mode usa_prod",
"pre": "vue-cli-service build --mode pre",

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 21 KiB

View File

@ -6,14 +6,7 @@
<div class="login-body">
<div class="login-l">
<div class="login-logo">
<img v-if="language === 'zh'" src="@/assets/zzlogo2.png" alt="" />
<img
v-else-if="NODE_ENV === 'usa'"
src="@/assets/zzlogo-usa.png"
alt=""
class="usa-logo"
/>
<img v-else src="@/assets/zzlogo4.png" alt="" />
<img src="@/assets/zzlogo-usa.png" alt="" class="usa-logo" />
</div>
<div
:class="{

View File

@ -155,17 +155,6 @@ export default {
},
],
IdCard: [
{
validator: (rule, value, callback) => {
let reg = new RegExp(/(^\d{15}$)|(^\d{17}([0-9]|X)$)/, 'ig')
if (value && !reg.test(value)) {
callback(new Error(this.$t('common:ruleMessage:pattern')))
} else {
callback()
}
},
trigger: 'blur',
},
{
max: 400,
message: this.$t('form:rules:maxLength:400'),
@ -173,17 +162,6 @@ export default {
},
],
BankPhoneNum: [
{
validator: (rule, value, callback) => {
let reg = new RegExp(/^\d{11}$/, 'i')
if (value && !reg.test(value)) {
callback(new Error(this.$t('common:ruleMessage:pattern')))
} else {
callback()
}
},
trigger: 'blur',
},
{
max: 400,
message: this.$t('form:rules:maxLength:400'),

View File

@ -21,7 +21,7 @@
:maxlength="400"
/>
</el-form-item>
<el-form-item
<!-- <el-form-item
:label="$t('system:Setting:label:Blind NameCN')"
prop="BlindNameCN"
>
@ -30,7 +30,7 @@
style="width: 300px"
:maxlength="400"
/>
</el-form-item>
</el-form-item> -->
<el-form-item
:label="$t('system:Setting:label:Blind Publications')"
prop="BlindPublications"

View File

@ -211,17 +211,6 @@ export default {
},
],
IdCard: [
{
validator: (rule, value, callback) => {
let reg = new RegExp(/(^\d{15}$)|(^\d{17}([0-9]|X)$)/, 'ig')
if (value && !reg.test(value)) {
callback(new Error(this.$t('common:ruleMessage:pattern')))
} else {
callback()
}
},
trigger: 'blur',
},
{
max: 400,
message: this.$t('form:rules:maxLength:400'),
@ -229,17 +218,6 @@ export default {
},
],
BankPhoneNum: [
{
validator: (rule, value, callback) => {
let reg = new RegExp(/^\d{11}$/, 'i')
if (value && !reg.test(value)) {
callback(new Error(this.$t('common:ruleMessage:pattern')))
} else {
callback()
}
},
trigger: 'blur',
},
{
max: 400,
message: this.$t('form:rules:maxLength:400'),

View File

@ -19,12 +19,12 @@
>
{{ DATA.BlindName }}
</el-form-item>
<el-form-item
<!-- <el-form-item
:label="$t('system:Setting:label:Blind NameCN')"
style="width: 45%"
>
{{ DATA.BlindNameCN }}
</el-form-item>
</el-form-item> -->
<div style="display: flex; font-size: 14px; margin-bottom: 22px">
<span style="display: inline-block; width: 120px; color: #000">{{
$t('system:Setting:label:Blind Publications')
@ -109,19 +109,19 @@
<div class="form_title">
{{ $t('system:Setting:title:Blinded information') }}
</div>
<el-row>
<el-col :span="12">
<el-form-item
:label="$t('system:Setting:label:Blind Name')"
prop="BlindName"
>
<el-input
v-model="form.BlindName"
clearable
:maxlength="400"
></el-input>
</el-form-item>
</el-col>
<!-- <el-row>
<el-col :span="12"> -->
<el-form-item
:label="$t('system:Setting:label:Blind Name')"
prop="BlindName"
>
<el-input
v-model="form.BlindName"
clearable
:maxlength="400"
></el-input>
</el-form-item>
<!-- </el-col>
<el-col :span="12">
<el-form-item
:label="$t('system:Setting:label:Blind NameCN')"
@ -134,7 +134,7 @@
></el-input>
</el-form-item>
</el-col>
</el-row>
</el-row> -->
<el-form-item
:label="$t('system:Setting:label:Blind Publications')"
prop="BlindPublications"

View File

@ -582,32 +582,9 @@
</div>
</div>
<div class="file" v-if="isAll && hasFile">
<div
class="curriculum"
v-if="
(resumeListCN && resumeListCN.length > 0) ||
(resumeListEN && resumeListEN.length > 0)
"
>
<div class="curriculum" v-if="resumeListEN && resumeListEN.length > 0">
<div class="title">{{ $t('curriculumVitae:curriculum:title') }}</div>
<div class="fileBox">
<div
class="file_title"
v-if="resumeListCN && resumeListCN.length > 0"
>
{{ $t('curriculumVitae:curriculum:fileTitle:CN') }}
</div>
<template v-if="true">
<div class="file" v-for="item in resumeListCN" :key="item.Id">
<div class="name" :title="item.FileName">{{ item.FileName }}</div>
<i
class="el-icon-download"
:title="$t('common:button:download')"
@click.stop="handlePreview(item)"
/>
</div>
</template>
<div class="noData" v-else>{{ $t('curriculumVitae:noData') }}</div>
<div
class="file_title"
v-if="resumeListEN && resumeListEN.length > 0"

View File

@ -1,14 +1,7 @@
<template>
<div class="trials-navbar" style="position: relative">
<div class="leftMenu">
<img v-if="language === 'zh'" src="@/assets/zzlogo2.png" alt="" />
<img
v-else-if="NODE_ENV === 'usa'"
src="@/assets/title-logo.png"
alt=""
class="title-logo"
/>
<img v-else src="@/assets/zzlogo4.png" alt="" />
<img src="@/assets/title-logo.png" alt="" class="title-logo" />
<span style="white-space: nowrap" v-if="NODE_ENV !== 'usa'">
<!-- 中心影像系统EICS -->
{{ $t('trials:trials:title:eics') }}

View File

@ -11,7 +11,7 @@ function resolve(dir) {
return path.join(__dirname, dir)
}
const name = process.env.NODE_ENV === 'usa' ? 'LILI' : defaultSettings.title || 'IRCIS' // page title
const name = process.env.NODE_ENV === 'usa' ? 'LiLi' : defaultSettings.title || 'IRCIS' // page title
// eslint-disable-next-line no-undef
module.exports = {
@ -159,28 +159,28 @@ module.exports = {
config.plugins.delete('preload') // TODO: need test
config.plugins.delete('prefetch') // TODO: need test
// set svg-sprite-loader
// config.optimization.splitChunks({
// chunks: "initial", //async异步代码分割 initial同步代码分割 all同步异步分割都开启
// minSize: 30000, //字节 引入的文件大于30kb才进行分割
// //maxSize: 50000, //50kb尝试将大于50kb的文件拆分成n个50kb的文件
// minChunks: 1, //模块至少使用次数
// maxAsyncRequests: 5, //同时加载的模块数量最多是5个只分割出同时引入的前5个文件
// maxInitialRequests: 3, //首页加载的时候引入的文件最多3个
// automaticNameDelimiter: '~', //缓存组和生成文件名称之间的连接符
// name: true, //缓存组里面的filename生效覆盖默认命名
// cacheGroups: { //缓存组,将所有加载模块放在缓存里面一起分割打包
// vendors: { //自定义打包模块
// test: /[\\/]node_modules[\\/]/,
// priority: -10, //优先级,先打包到哪个组里面,值越大,优先级越高
// filename: 'vendors.js',
// },
// default: { //默认打包模块
// priority: -20,
// reuseExistingChunk: true, //模块嵌套引入时,判断是否复用已经被打包的模块
// filename: 'common.js'
// }
// }
// })
config.optimization.splitChunks({
chunks: "initial", //async异步代码分割 initial同步代码分割 all同步异步分割都开启
minSize: 30000, //字节 引入的文件大于30kb才进行分割
maxSize: 5000000, //50kb尝试将大于50kb的文件拆分成n个50kb的文件
minChunks: 1, //模块至少使用次数
maxAsyncRequests: 30, //同时加载的模块数量最多是5个只分割出同时引入的前5个文件
maxInitialRequests: 30, //首页加载的时候引入的文件最多3个
automaticNameDelimiter: '_', //缓存组和生成文件名称之间的连接符
name: true, //缓存组里面的filename生效覆盖默认命名
cacheGroups: { //缓存组,将所有加载模块放在缓存里面一起分割打包
vendors: { //自定义打包模块
test: /[\\/]node_modules[\\/]/,
priority: -10, //优先级,先打包到哪个组里面,值越大,优先级越高
filename: 'vendors.js',
},
default: { //默认打包模块
priority: -20,
reuseExistingChunk: true, //模块嵌套引入时,判断是否复用已经被打包的模块
filename: 'common.js'
}
}
})
config.module
.rule('svg')
.exclude.add(resolve('src/icons'))