提交 e1e04a83 authored 作者: 王鹏飞's avatar 王鹏飞

bug fixes

上级 e5ba2ace
...@@ -100,7 +100,7 @@ function remoteMethod(item: RuleAttr, search: string = '') { ...@@ -100,7 +100,7 @@ function remoteMethod(item: RuleAttr, search: string = '') {
</div> </div>
<div class="rule-list"> <div class="rule-list">
<el-row justify="space-between" class="rule-item" v-for="(item, index) in userAttrRule.items" :key="index"> <el-row justify="space-between" class="rule-item" v-for="(item, index) in userAttrRule.items" :key="index">
<div> <div style="display: flex">
<el-form-item> <el-form-item>
<el-select v-model="item.attr_id" @change="value => handleAttrChange(value, item)"> <el-select v-model="item.attr_id" @change="value => handleAttrChange(value, item)">
<el-option v-for="option in userAttrList" :key="option.id" :label="option.name" :value="option.id"></el-option> <el-option v-for="option in userAttrList" :key="option.id" :label="option.name" :value="option.id"></el-option>
...@@ -116,8 +116,13 @@ function remoteMethod(item: RuleAttr, search: string = '') { ...@@ -116,8 +116,13 @@ function remoteMethod(item: RuleAttr, search: string = '') {
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="!['null', 'not null'].includes(item.operate)"> <el-form-item v-if="!['null', 'not null'].includes(item.operate)">
<!-- 数字区间 -->
<template v-if="['2', '3'].includes(item.attr_type) && item.operate === 'range'">
<el-input-number step-strictly :controls="false" :min="0" v-model="item.value.start" />
<el-input-number step-strictly :controls="false" :min="0" v-model="item.value.end" />
</template>
<!-- 日期区间 --> <!-- 日期区间 -->
<template v-if="item.attr_type === '4' && item.operate === 'range'"> <template v-else-if="item.attr_type === '4' && item.operate === 'range'">
<el-date-picker v-model="item.value.start" type="date" value-format="YYYY-MM-DD" /> <el-date-picker v-model="item.value.start" type="date" value-format="YYYY-MM-DD" />
<el-date-picker v-model="item.value.end" type="date" value-format="YYYY-MM-DD" /> <el-date-picker v-model="item.value.end" type="date" value-format="YYYY-MM-DD" />
</template> </template>
......
...@@ -25,7 +25,7 @@ router.beforeEach(async (to, from, next) => { ...@@ -25,7 +25,7 @@ router.beforeEach(async (to, from, next) => {
path: to.path, path: to.path,
query: { query: {
...to.query, ...to.query,
experiment_id: from.query.experiment_id || '7165149417073278976', experiment_id: from.query.experiment_id || '7096723405503725568',
student_id: from.query.student_id, student_id: from.query.student_id,
force_tgc: from.query.force_tgc force_tgc: from.query.force_tgc
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论