Compare commits
No commits in common. "75f3b37c05226ded9c956e17bfce5c810e9d4b7f" and "4defa157ee75e190f2ce486acf273bd157a33b26" have entirely different histories.
75f3b37c05
...
4defa157ee
|
@ -49,8 +49,6 @@ export default {
|
|||
title: this.$t('system:loginLog:dialog:title'),
|
||||
width: '500px',
|
||||
top: '10vh',
|
||||
appendToBody: true,
|
||||
bodyStyle: `min-height: 100px; max-height: 650px;overflow-y: auto;padding: 10px;border: 1px solid #e0e0e0;`,
|
||||
}
|
||||
},
|
||||
},
|
||||
|
@ -88,9 +86,4 @@ export default {
|
|||
},
|
||||
},
|
||||
}
|
||||
</script>
|
||||
<style lang="scss" scoped>
|
||||
::v-deep .el-form-item__label {
|
||||
font-weight: bold;
|
||||
}
|
||||
</style>
|
||||
</script>
|
|
@ -72,10 +72,12 @@
|
|||
"
|
||||
:label="item.value"
|
||||
v-if="
|
||||
item.value < 4 ||
|
||||
(item.value > 3 &&
|
||||
(QuestionList[index].Type === 'number' ||
|
||||
QuestionList[index].Type === 'calculation'))
|
||||
(JudgyInfo.ArbitrationRule === 1 &&
|
||||
(item.value < 4 ||
|
||||
(item.value > 3 &&
|
||||
(QuestionList[index].Type === 'number' ||
|
||||
QuestionList[index].Type === 'calculation')))) ||
|
||||
(JudgyInfo.ArbitrationRule === 2 && item.value < 4)
|
||||
"
|
||||
>
|
||||
{{ item.label }}
|
||||
|
|
Loading…
Reference in New Issue