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

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

uat_us
wangxiaoshuang 2024-10-18 17:24:32 +08:00
parent 219e39afb3 e255f8c859
commit 3694c51288
3 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/views/trials/trials-panel/setting/reading-unit/components/QuestionFormItem.vue
View File

@ -499,9 +499,10 @@ export default {
if (rules.CalculateQuestionList.length === 0) {
return false;
}
let dataArr = []
rules.CalculateQuestionList.forEach((o, i) => {
if (i === 0) {
if (rules.CustomCalculateMark > 4) {
if (rules.CustomCalculateMark > 4 && rules.CustomCalculateMark < 10) {
switch (rules.CustomCalculateMark) {
case 5:
this.questionForm[o.QuestionId].forEach((q, qi) => {
@ -552,6 +553,7 @@ export default {
}
} else {
num = parseFloat(this.questionForm[o.TableQuestionId]);
dataArr.push(num)
}
} else {
switch (rules.CustomCalculateMark) {
@ -567,6 +569,26 @@ export default {
case 4:
num /= parseFloat(this.questionForm[o.TableQuestionId]);
break;
case 10:
if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
}
num = dataArr.length === 0 ? 0 : dataArr.reduce((acc, curr) => {
return acc + (typeof curr === "number" ? curr : 0);
}, 0) / dataArr.length;
break;
case 11:
if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
}
num = Math.max(...dataArr);
break;
case 12:
if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
}
num = Math.min(...dataArr);
break;
}
}
});
@ -581,8 +603,6 @@ export default {
var find = v.CalculateQuestionList.filter((o) => {
return o.QuestionId === questionId;
});
// find的自动计算值number
console.log("find", find);
if (find) {
var num = this.logic(v);
if (num !== false) {

2
src/views/trials/trials-panel/setting/reading-unit/components/QuestionTableFormItem.vue
View File

@ -246,7 +246,7 @@ export default {
deep: true,
immediate: true,
handler(v) {
console.log(v)
// console.log(v)
}
}
},

15
src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
View File

@ -518,7 +518,7 @@
<div>
<el-radio
v-for="item of $d.CustomCalculateMark"
v-show="item.value <= 4"
v-show="item.value <= 4 || item.value === 10 || item.value === 11 || item.value === 12"
:key="`CustomCalculateMark${item.value}`"
:label="item.value"
>
@ -528,7 +528,7 @@
<div>
<el-radio
v-for="item of $d.CustomCalculateMark"
v-show="item.value > 4"
v-show="item.value > 4 && item.value < 10"
:key="`CustomCalculateMark${item.value}`"
:label="item.value"
>
@ -561,13 +561,13 @@
>
<template slot-scope="scope">
{{
scope.$index === 0 && [1, 2, 3, 4].includes(form.CustomCalculateMark) ? null : $fd('CustomCalculateMark', form.CustomCalculateMark)
scope.$index === 0 && [1, 2, 3, 4, 10, 11, 12].includes(form.CustomCalculateMark) ? null : $fd('CustomCalculateMark', form.CustomCalculateMark)
}}
</template>
</el-table-column>
<!-- 表格名称 -->
<el-table-column
v-if="form.CustomCalculateMark > 4"
v-if="form.CustomCalculateMark > 4 && form.CustomCalculateMark < 10"
:label="$t('trials:readingUnit:qsList:title:tableName')"
prop="QuestionId"
show-overflow-tooltip
@ -600,7 +600,7 @@
</template>
</el-table-column>
<el-table-column
v-if="form.CustomCalculateMark <= 4"
v-if="form.CustomCalculateMark <= 4 || form.CustomCalculateMark >= 10"
:label="$t('common:action:action')"
prop="TableQuestionId"
show-overflow-tooltip
@ -629,7 +629,7 @@
<div style="font-size: 12px;color:#666;padding: 0 15px 0;text-align: right">
<!-- '请选择同级问题！': '请选择表格问题下的子问题！' -->
<i class="el-icon-info"/>{{
[1, 2, 3, 4].includes(form.CustomCalculateMark) ? $t('trials:readingUnit:qsList:message:msg1') : $t('trials:readingUnit:qsList:message:msg2')
[1, 2, 3, 4, 10, 11, 12].includes(form.CustomCalculateMark) ? $t('trials:readingUnit:qsList:message:msg1') : $t('trials:readingUnit:qsList:message:msg2')
}}
</div>
</div>
@ -947,7 +947,8 @@ export default {
},
CustomCalculateMarkChange() {
this.isShow = false
if (this.form.CustomCalculateMark <= 4) {
if (this.form.CustomCalculateMark <= 4 || this.form.CustomCalculateMark >= 10) {
console.log('1111')
this.form.CalculateQuestions = [
{
IsTable: false,