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

Compare commits

base: XCKJ:b43202076cf8759ebbe5ab575a3baf31aa4167cf
Branches Tags
XCKJ:main
XCKJ:uat
XCKJ:uat_us
XCKJ:v1.12.1
XCKJ:v1.12.0
XCKJ:v1.9.1
XCKJ:v1.11.1
XCKJ:v1.11.3
XCKJ:v1.11.2
XCKJ:v1.11.0
XCKJ:v1.10.1
XCKJ:v1.10.0
XCKJ:v1.9.0
XCKJ:v1.8.0
XCKJ:v1.7.0
XCKJ:v1.6.0
XCKJ:v1.5.4
XCKJ:v1.5.3
XCKJ:v1.5.2
XCKJ:v1.5.1
XCKJ:v1.5.0
XCKJ:v1.4.0
XCKJ:usa
XCKJ:v1.3.2
...
compare: XCKJ:fbb41e3fd92904bba0202a7a7a295a53f08a1ae5
Branches Tags
XCKJ:main
XCKJ:uat
XCKJ:uat_us
XCKJ:v1.12.1
XCKJ:v1.12.0
XCKJ:v1.9.1
XCKJ:v1.11.1
XCKJ:v1.11.3
XCKJ:v1.11.2
XCKJ:v1.11.0
XCKJ:v1.10.1
XCKJ:v1.10.0
XCKJ:v1.9.0
XCKJ:v1.8.0
XCKJ:v1.7.0
XCKJ:v1.6.0
XCKJ:v1.5.4
XCKJ:v1.5.3
XCKJ:v1.5.2
XCKJ:v1.5.1
XCKJ:v1.5.0
XCKJ:v1.4.0
XCKJ:usa
XCKJ:v1.3.2

12 Commits
b43202076c ... fbb41e3fd9

Author SHA1 Message Date
DESKTOP-6C3NK6N\WXS fbb41e3fd9 1
continuous-integration/drone/push Build is passing Details
2024-07-30 13:42:24 +08:00
DESKTOP-6C3NK6N\WXS 7311252d3c Merge branch 'uat' into uat_us 2024-07-30 13:33:09 +08:00
DESKTOP-6C3NK6N\WXS 2e11c881f5 1 2024-07-30 10:43:24 +08:00
DESKTOP-6C3NK6N\WXS 535d30b6df logo调整 2024-07-30 10:18:31 +08:00
DESKTOP-6C3NK6N\WXS 47fc6c5ef0 mfa国际化修改 2024-07-25 14:54:41 +08:00
DESKTOP-6C3NK6N\WXS a0eaf2f64a 美国uat发布 2024-07-24 13:10:42 +08:00
DESKTOP-6C3NK6N\WXS f32abfe230 1 2024-07-19 14:34:21 +08:00
DESKTOP-6C3NK6N\WXS 3f5092bcbb 1 2024-07-19 13:28:43 +08:00
DESKTOP-6C3NK6N\WXS f0e6c5b9de Merge branch 'uat' into uat_us 2024-07-19 13:24:35 +08:00
wangxiaoshuang 3ae982d422 国际化修改 2024-07-17 13:35:18 +08:00
wangxiaoshuang 978aacf085 非dicom阅片国际化修改 2024-07-17 11:16:38 +08:00
wangxiaoshuang 67ceadcc9c 登录日志访问ip屏蔽 2024-07-15 13:48:36 +08:00
8 changed files with 198 additions and 197 deletions
Show Stats 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-12/' VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-07-30/'
# 是否开启登陆限制 true:是 false:否 # 是否开启登陆限制 true:是 false:否
VUE_APP_LOGIN_FOR_PERMISSION = true VUE_APP_LOGIN_FOR_PERMISSION = true

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

370
src/components/Dicom/DicomCanvas.vue
View File

@ -874,192 +874,192 @@ export default {
this.setAllToolsPassive() this.setAllToolsPassive()
}, },
onContextmenu(event) { onContextmenu(event) {
const colormapsList = cornerstone.colors.getColormapsList() // const colormapsList = cornerstone.colors.getColormapsList()
const colorItems = [] // const colorItems = []
colorItems.push({ // colorItems.push({
label: '默认值', // label: '默认值',
onClick: () => { // onClick: () => {
this.setColormap() // this.setColormap()
} // }
}) // })
colormapsList.forEach(colormap => { // colormapsList.forEach(colormap => {
const item = {} // const item = {}
item.label = colormap.name // item.label = colormap.name
item.onClick = () => { // item.onClick = () => {
this.setColormap(colormap.id) // this.setColormap(colormap.id)
} // }
colorItems.push(item) // colorItems.push(item)
}) // })
this.$contextmenu({ // this.$contextmenu({
items: [ // items: [
{ // {
label: '移动', // label: '移动',
divided: true, // divided: true,
onClick: () => { // onClick: () => {
this.setToolActive('Pan') // this.setToolActive('Pan')
} // }
}, // },
{ // {
label: '缩放', // label: '缩放',
divided: true, // divided: true,
children: [ // children: [
{ // {
label: '自由缩放', // label: '自由缩放',
onClick: () => { // onClick: () => {
this.setToolActive('Zoom') // this.setToolActive('Zoom')
} // }
}, // },
{ // {
label: '适应图像', // label: '适应图像',
onClick: () => { // onClick: () => {
this.fitToWindow() // this.fitToWindow()
} // }
}, // },
{ // {
label: '适应窗口', // label: '适应窗口',
onClick: () => { // onClick: () => {
this.fitToImage() // this.fitToImage()
} // }
} // }
] // ]
}, // },
{ // {
label: '透镜', // label: '透镜',
divided: true, // divided: true,
onClick: () => { // onClick: () => {
this.setToolActive('Magnify') // this.setToolActive('Magnify')
} // }
}, // },
{ // {
label: '旋转', // label: '旋转',
divided: true, // divided: true,
children: [ // children: [
{ // {
label: '默认值', // label: '默认值',
onClick: () => { // onClick: () => {
this.resetRotate() // this.resetRotate()
} // }
}, // },
{ // {
label: '自由旋转', // label: '自由旋转',
onClick: () => { // onClick: () => {
this.setToolActive('Rotate') // this.setToolActive('Rotate')
} // }
}, // },
{ // {
label: '水平翻转', // label: '水平翻转',
onClick: () => { // onClick: () => {
this.setRotate(true, false, 0) // this.setRotate(true, false, 0)
} // }
}, // },
{ // {
label: '垂直翻转', // label: '垂直翻转',
onClick: () => { // onClick: () => {
this.setRotate(false, true, 0) // this.setRotate(false, true, 0)
} // }
}, // },
{ // {
label: '左转90度', // label: '左转90度',
onClick: () => { // onClick: () => {
this.setRotate(false, false, -90) // this.setRotate(false, false, -90)
} // }
}, // },
{ // {
label: '右转90度', // label: '右转90度',
onClick: () => { // onClick: () => {
this.setRotate(false, false, 90) // this.setRotate(false, false, 90)
} // }
} // }
] // ]
}, // },
{ // {
label: '测量', // label: '测量',
divided: true, // divided: true,
minWidth: 0, // minWidth: 0,
children: [ // children: [
{ // {
label: '探针', // label: '探针',
onClick: () => { // onClick: () => {
this.setToolActive('Probe') // this.setToolActive('Probe')
} // }
}, // },
{ // {
label: '长度测量', // label: '长度测量',
onClick: () => { // onClick: () => {
this.setToolActive('Length') // this.setToolActive('Length')
} // }
}, // },
{ // {
label: '角度测量', // label: '角度测量',
onClick: () => { // onClick: () => {
this.setToolActive('Angle') // this.setToolActive('Angle')
} // }
}, // },
{ // {
label: 'Cobb测量', // label: 'Cobb测量',
onClick: () => { // onClick: () => {
this.setToolActive('CobbAngle') // this.setToolActive('CobbAngle')
} // }
}, // },
{ // {
label: '椭圆测量', // label: '椭圆测量',
onClick: () => { // onClick: () => {
this.setToolActive('EllipticalRoi') // this.setToolActive('EllipticalRoi')
} // }
}, // },
{ // {
label: '矩形测量', // label: '矩形测量',
onClick: () => { // onClick: () => {
this.setToolActive('RectangleRoi') // this.setToolActive('RectangleRoi')
} // }
}, // },
{ // {
label: '多边形标记', // label: '多边形标记',
onClick: () => { // onClick: () => {
this.setToolActive('FreehandRoi') // this.setToolActive('FreehandRoi')
} // }
}, // },
{ // {
label: '十字线', // label: '十字线',
onClick: () => { // onClick: () => {
this.setToolActive('Bidirectional') // this.setToolActive('Bidirectional')
} // }
}, // },
{ // {
label: '文字标注', // label: '文字标注',
onClick: () => { // onClick: () => {
this.setToolActive('ArrowAnnotate') // this.setToolActive('ArrowAnnotate')
} // }
} // }
] // ]
}, // },
{ // {
label: '调窗', // label: '调窗',
divided: true, // divided: true,
onClick: () => { // onClick: () => {
this.setToolActive('Wwwc') // this.setToolActive('Wwwc')
} // }
}, // },
{ // {
label: '反色', // label: '反色',
divided: true, // divided: true,
onClick: () => { // onClick: () => {
this.toggleInvert() // this.toggleInvert()
} // }
}, // },
{ // {
label: '伪彩', // label: '伪彩',
children: colorItems // children: colorItems
} // }
], // ],
event, // event,
// x: event.clientX, // // x: event.clientX,
// y: event.clientY, // // y: event.clientY,
customClass: 'class-a', // customClass: 'class-a',
zIndex: 3, // zIndex: 3,
minWidth: 100 // minWidth: 100
}) // })
return false return false
}, },
getToolSate() { getToolSate() {

6
src/components/MFA/index.vue
View File

@ -91,21 +91,21 @@ export default {
Code: [ Code: [
{ {
required: true, required: true,
message: this.$t("common:ruleMessage:specify"), message: this.$t("mfa:ruleMessage:specify"),
trigger: "blur", trigger: "blur",
}, },
], ],
EMail: [ EMail: [
{ {
required: true, required: true,
message: this.$t("common:ruleMessage:specify"), message: this.$t("mfa:ruleMessage:specify"),
trigger: "blur", trigger: "blur",
}, },
], ],
username: [ username: [
{ {
required: true, required: true,
message: this.$t("common:ruleMessage:specify"), message: this.$t("mfa:ruleMessage:specify"),
trigger: "blur", trigger: "blur",
}, },
], ],

4
src/views/system/login-log/index.vue
View File

@ -85,13 +85,13 @@
sortable="custom" sortable="custom"
show-overflow-tooltip show-overflow-tooltip
/> />
<el-table-column <!-- <el-table-column
:label="$t('trials:loginLog:table:IPRegion')" :label="$t('trials:loginLog:table:IPRegion')"
prop="IPRegion" prop="IPRegion"
min-width="120" min-width="120"
show-overflow-tooltip show-overflow-tooltip
sortable="custom" sortable="custom"
/> /> -->
<el-table-column <el-table-column
:label="$t('system:loginLog:table:LoginFaildName')" :label="$t('system:loginLog:table:LoginFaildName')"
prop="LoginFaildName" prop="LoginFaildName"

2
src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue
View File

@ -7,7 +7,7 @@
{{ language==='en'?question.GroupEnName:question.GroupName }} {{ language==='en'?question.GroupEnName:question.GroupName }}
</h4> </h4>
</div> </div>
<template v-else-if="((question.QuestionType === 56 || question.QuestionType === 57) && question.IsBaseLineTask)" /> <template v-else-if="((question.QuestionType === 56) && question.IsBaseLineTask)" />
<template v-else> <template v-else>
<el-form-item <el-form-item
v-if="(question.ShowQuestion===1 && question.ParentTriggerValueList.includes(String(questionForm[question.ParentId]))) || question.ShowQuestion===0" v-if="(question.ShowQuestion===1 && question.ParentTriggerValueList.includes(String(questionForm[question.ParentId]))) || question.ShowQuestion===0"

2
src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue
View File

@ -29,7 +29,7 @@
class="title" class="title"
> >
{{ item.QuestionName }} {{ item.QuestionName }}
<span v-if="isFirstChangeTask && item.TableQuestions.Answers.length > 0" style="color:red;font-size: 12px;">(请重新评估)</span> <span v-if="isFirstChangeTask && item.TableQuestions.Answers.length > 0" style="color:red;font-size: 12px;">{{ $t("trials:reading:dicom:IRecist:reevaluate") }}</span>
</div> </div>
<div v-else class="title"> <div v-else class="title">
{{ item.QuestionName }} {{ item.QuestionName }}

7
src/views/trials/trials-panel/reading/none-dicoms/index.vue
View File

@ -59,7 +59,7 @@
:show-close="false" :show-close="false"
> >
<span slot="title" class="dialog-footer"> <span slot="title" class="dialog-footer">
当前阅片任务存在临床数据，请查看。若已查看，请点击“确认” {{ $t('trials:reading:noneDicom:tip:hasCllinicalData') }}
</span> </span>
<div :style="{'height':dialogH,'margin':0}"> <div :style="{'height':dialogH,'margin':0}">
<ClinicalData <ClinicalData
@ -70,7 +70,7 @@
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button type="primary" @click="handleConfirmCD">确认</el-button> <el-button type="primary" @click="handleConfirmCD">{{$t("common:button:confirm")}}</el-button>
</span> </span>
</el-dialog> </el-dialog>
@ -136,7 +136,8 @@ export default {
this.readingTool = this.$router.currentRoute.query.readingTool this.readingTool = this.$router.currentRoute.query.readingTool
this.isNewSubject = this.$router.currentRoute.query.isNewSubject this.isNewSubject = this.$router.currentRoute.query.isNewSubject
if (this.isNewSubject && this.isReadingTaskViewInOrder) { if (this.isNewSubject && this.isReadingTaskViewInOrder) {
this.$message.success(`已开始受试者${this.subjectCode}阅片任务`) let message = this.$t('trials:reading:noneDicom:message:startRead').replace("xxx",this.subjectCode);
this.$message.success(message)
changeURLStatic('isNewSubject', '') changeURLStatic('isNewSubject', '')
} }
if (this.$router.currentRoute.query.TokenKey) { if (this.$router.currentRoute.query.TokenKey) {