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

uat_us
wangxiaoshuang 2024-11-11 15:24:26 +08:00
commit 6992dc6a2b
3 changed files with 13 additions and 1 deletions

View File

@ -186,6 +186,12 @@
{{ item.trim() }}
</el-radio>
</el-radio-group>
<el-input
v-if="question.Type === 'class' && question.ClassifyShowType === 4"
type="number"
:disabled="!question.ClassifyEditType"
v-model="questionForm[question.Id]"
/>
<!-- 自动计算 -->
<!-- :precision="2" :step="0.1" :max="10" -->
<el-input

View File

@ -229,6 +229,12 @@
{{ item.trim() }}
</el-radio>
</el-radio-group>
<el-input
v-if="question.Type === 'class' && question.ClassifyShowType === 4"
type="number"
:disabled="!question.ClassifyEditType"
v-model="questionForm[question.Id]"
/>
<!-- 自增 -->
<el-input
v-if="question.Type === 'increment'"

View File

@ -720,7 +720,7 @@
<div style="font-size: 12px;color:#666;padding: 0 15px 0;text-align: right">
<!-- '请选择同级问题!': '请选择表格问题下的子问题!' -->
<i class="el-icon-info"/>{{
[1, 2, 3, 4, 10, 11, 12].includes(form.CustomCalculateMark) ? $t('trials:readingUnit:qsList:message:msg1') : $t('trials:readingUnit:qsList:message:msg2')
[1, 2, 3, 4, 10, 11, 12, 13, 14].includes(form.CustomCalculateMark) ? $t('trials:readingUnit:qsList:message:msg1') : $t('trials:readingUnit:qsList:message:msg2')
}}
</div>
</div>