Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web
continuous-integration/drone/push Build is failing Details

uat_us
wangxiaoshuang 2024-12-27 11:49:00 +08:00
commit 1286cd1212
3 changed files with 25 additions and 13 deletions

View File

@ -10,8 +10,7 @@
<div class="base-dialog-body"> <div class="base-dialog-body">
<div style="display: flex;justify-content: space-between;"> <div style="display: flex;justify-content: space-between;">
<h3 v-if="questionName" style="color: #ddd;padding: 5px 0px;margin: 0;"> <h3 v-if="questionName" style="color: #ddd;padding: 5px 0px;margin: 0;">
<!-- {{ `${questionName} (${orderMark}${String(rowIndex).padStart(2, '0')})` }} --> <!-- {{ lesionName }} -->
{{ lesionName }}
</h3> </h3>
<!-- 关闭 --> <!-- 关闭 -->
<div> <div>
@ -52,7 +51,7 @@
type="text" type="text"
@click="addAnnotation(qs)" @click="addAnnotation(qs)"
> >
测量 {{$t('trials:MRIPDFF:button:measure')}}
</el-button> </el-button>
<!-- 清除标记 --> <!-- 清除标记 -->
<el-button <el-button
@ -62,9 +61,9 @@
@click="removeAnnotation(qs)" @click="removeAnnotation(qs)"
style="margin-left: 0px" style="margin-left: 0px"
> >
清除 {{$t('trials:MRIPDFF:button:clear')}}
</el-button> </el-button>
<!-- 定位 --> <!-- 返回 -->
<el-button <el-button
v-if="questionForm[qs.Id]" v-if="questionForm[qs.Id]"
size="mini" size="mini"
@ -72,7 +71,7 @@
@click="locateAnnotation(qs)" @click="locateAnnotation(qs)"
style="margin-left: 0px" style="margin-left: 0px"
> >
返回 {{$t('trials:MRIPDFF:button:return')}}
</el-button> </el-button>
<!-- 保存 --> <!-- 保存 -->
<el-button <el-button
@ -677,13 +676,15 @@ export default {
// //
let i = this.markList.findIndex(i=>i.saveEnum === 0) let i = this.markList.findIndex(i=>i.saveEnum === 0)
if (i > -1) { if (i > -1) {
this.$message.warning('请先保存标注信息!') //
this.$message.warning(this.$t('trials:MRIPDFF:message:message1'))
return return
} }
} else { } else {
// //
// ''
const confirm = await this.$confirm( const confirm = await this.$confirm(
'是否确认不可测量?', this.$t('trials:MRIPDFF:message:message2'),
{ {
type: 'warning', type: 'warning',
distinguishCancelAndClose: true distinguishCancelAndClose: true

View File

@ -34,9 +34,12 @@
</div> </div>
<div style="color: #ddd;text-align: left;padding: 5px 10px;border-bottom: 1px solid #5a5a5a; font-size: 15px;"> <div style="color: #ddd;text-align: left;padding: 5px 10px;border-bottom: 1px solid #5a5a5a; font-size: 15px;">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="7">分段</el-col> <!-- 分段 -->
<el-col :span="8">是否可测量</el-col> <el-col :span="7">{{$t('trials:MRIPDFF:label:col1')}}</el-col>
<el-col :span="6">平均值</el-col> <!-- 是否可测量 -->
<el-col :span="8">{{$t('trials:MRIPDFF:label:col2')}}</el-col>
<!-- 平均值 -->
<el-col :span="6">{{$t('trials:MRIPDFF:label:col3')}}</el-col>
</el-row> </el-row>
</div> </div>
@ -107,7 +110,6 @@
</div> </div>
</template> </template>
<script> <script>
import { splitLesion } from '@/api/trials'
import { resetReadingTask } from '@/api/reading' import { resetReadingTask } from '@/api/reading'
import DicomEvent from './../DicomEvent' import DicomEvent from './../DicomEvent'
import store from '@/store' import store from '@/store'

View File

@ -467,7 +467,7 @@ export default {
if ((item.LesionType === 1 || item.LesionType === 2 || item.LesionType === 6 || item.LesionType === 7 || item.LesionType === 8) && isNTFilterLength) { if ((item.LesionType === 1 || item.LesionType === 2 || item.LesionType === 6 || item.LesionType === 7 || item.LesionType === 8) && isNTFilterLength) {
filterArr = [0, 1, 3, 4, 5, 6, 2, 8, 10, 7] filterArr = [0, 1, 3, 4, 5, 6, 2, 8, 10, 7]
} else { } else {
filterArr = [3, 4, 5, 6, 2, 8, 10, 7] filterArr = [3, 4, 5, 6, 2, 8, 10, 7, 1106]
} }
if ((lesionType === 0 || lesionType === 5) && isLymphNodes === 0 && !this.isShowDetail && (this.CriterionType === 1 || this.CriterionType === 3 || this.CriterionType === 17)) { if ((lesionType === 0 || lesionType === 5) && isLymphNodes === 0 && !this.isShowDetail && (this.CriterionType === 1 || this.CriterionType === 3 || this.CriterionType === 17)) {
filterArr.push(1) filterArr.push(1)
@ -542,6 +542,15 @@ export default {
} }
} }
} }
if (this.CriterionType === 21) {
var liverSegmentIdx = item.Childrens.findIndex(i => i.QuestionMark === 1106)
if (liverSegmentIdx > -1) {
if (item.Childrens[liverSegmentIdx].Answer.length > 0) {
let v = item.Childrens[liverSegmentIdx].Answer[0].Answer
obj.QuestionName = this.$fd(item.Childrens[liverSegmentIdx].DictionaryCode, parseInt(v))
}
}
}
} catch (e) { } catch (e) {
console.log(e) console.log(e)
} }