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

Merge branch 'uat'
continuous-integration/drone/push Build is passing Details 

# Conflicts:
#	src/views/login/index.vue
uat_us
wangxiaoshuang 2024-07-10 09:53:28 +08:00
parent 6e2b7cb76a ee846d7370
commit 3d3e6a3db0
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env.usa
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-07-03/' VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-07-10/'
# 是否开启登陆限制 true:是 false:否 # 是否开启登陆限制 true:是 false:否
VUE_APP_LOGIN_FOR_PERMISSION = false VUE_APP_LOGIN_FOR_PERMISSION = false

1
src/utils/dcmUpload/anonymization.js
View File

@ -4,7 +4,6 @@ import dcmjs from './dcmjs'
export const anonymization = function (file, config) { export const anonymization = function (file, config) {
return new Promise(async (resolve, reject) => { return new Promise(async (resolve, reject) => {
try { try {
console.log(file);
const reader = new FileReader() const reader = new FileReader()
let AnonymizeFixedList = config.AnonymizeFixedList let AnonymizeFixedList = config.AnonymizeFixedList
let AnonymizeNotFixedList = config.AnonymizeNotFixedList let AnonymizeNotFixedList = config.AnonymizeNotFixedList

3
src/views/login/index.vue
View File

@ -410,7 +410,7 @@ export default {
/* 修复input 背景不协调 和光标变色 */ /* 修复input 背景不协调 和光标变色 */
$bg: #283443; $bg: #283443;
$light_gray: #909399; $light_gray: #0093dd;
$cursor: #fff; $cursor: #fff;
// @supports (-webkit-mask: none) and (not (cater-color: $cursor)) { // @supports (-webkit-mask: none) and (not (cater-color: $cursor)) {
@ -541,7 +541,6 @@ $light_gray: #606266;
// margin-bottom: 50px; // margin-bottom: 50px;
text-align: center; text-align: center;
margin-top: 18%; margin-top: 18%;
.title { .title {
font-size: 35px; font-size: 35px;
color: $light_gray; color: $light_gray;