|
@@ -54,7 +54,7 @@
|
|
</el-option>
|
|
</el-option>
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
- <el-form-item class="min-margin" v-if="groupData.dataType==='1'" label="最大值:" required>
|
|
|
|
|
|
+ <el-form-item class="min-margin" v-if="groupData.dataType==='1'" label="最大值:">
|
|
<div class="select-item clearfix">
|
|
<div class="select-item clearfix">
|
|
<el-col :span="4">
|
|
<el-col :span="4">
|
|
<el-form-item prop="subMaxOperator">
|
|
<el-form-item prop="subMaxOperator">
|
|
@@ -62,7 +62,7 @@
|
|
placeholder="请选择"
|
|
placeholder="请选择"
|
|
size="small">
|
|
size="small">
|
|
<el-option
|
|
<el-option
|
|
- v-for="item in operTypeList"
|
|
|
|
|
|
+ v-for="item in operMaxList"
|
|
:key="item.key"
|
|
:key="item.key"
|
|
:label="item.name"
|
|
:label="item.name"
|
|
:value="item.key">
|
|
:value="item.key">
|
|
@@ -82,7 +82,7 @@
|
|
</el-col>
|
|
</el-col>
|
|
</div>
|
|
</div>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
- <el-form-item class="min-margin" v-if="groupData.dataType==='1'" label="最小值:" required>
|
|
|
|
|
|
+ <el-form-item class="min-margin" v-if="groupData.dataType==='1'" label="最小值:">
|
|
<div class="select-item clearfix">
|
|
<div class="select-item clearfix">
|
|
<el-col :span="4">
|
|
<el-col :span="4">
|
|
<el-form-item prop="subMinOperator">
|
|
<el-form-item prop="subMinOperator">
|
|
@@ -90,7 +90,7 @@
|
|
placeholder="请选择"
|
|
placeholder="请选择"
|
|
size="small">
|
|
size="small">
|
|
<el-option
|
|
<el-option
|
|
- v-for="item in operTypeList"
|
|
|
|
|
|
+ v-for="item in operMinList"
|
|
:key="item.name"
|
|
:key="item.name"
|
|
:label="item.name"
|
|
:label="item.name"
|
|
:value="item.name">
|
|
:value="item.name">
|
|
@@ -132,12 +132,13 @@
|
|
return {
|
|
return {
|
|
baseTermTypeList:[],
|
|
baseTermTypeList:[],
|
|
typeList:[],
|
|
typeList:[],
|
|
- operTypeList:[{name:'>',key:'>'},
|
|
|
|
- {name:'>=',key:'>='},
|
|
|
|
- {name:'<',key:'<'},
|
|
|
|
|
|
+ operMaxList:[
|
|
{name:'<=',key:'<='},
|
|
{name:'<=',key:'<='},
|
|
{name:'=',key:'='},
|
|
{name:'=',key:'='},
|
|
],
|
|
],
|
|
|
|
+ operMinList:[{name:'>',key:'>'},
|
|
|
|
+ {name:'>=',key:'>='},
|
|
|
|
+ ],
|
|
dataTypes:[{id:'1',name:'数值类型'},{id:'2',name:'文本类型'}],
|
|
dataTypes:[{id:'1',name:'数值类型'},{id:'2',name:'文本类型'}],
|
|
conceptList:[],
|
|
conceptList:[],
|
|
rules:{
|
|
rules:{
|
|
@@ -199,6 +200,7 @@
|
|
},
|
|
},
|
|
methods:{
|
|
methods:{
|
|
dataTypeChange(val){
|
|
dataTypeChange(val){
|
|
|
|
+ this.groupData.subEqOperator=val==='2'?'=':undefined;
|
|
this.groupData.dataType=val;
|
|
this.groupData.dataType=val;
|
|
this.clearNumText();
|
|
this.clearNumText();
|
|
},
|
|
},
|