Merge branch 'lx-test' of 47.94.45.65:angelo/web-base-admin into lx-online
This commit is contained in:
commit
fb857c3178
|
@ -32,9 +32,14 @@
|
||||||
/> </el-select></el-form-item></el-col>
|
/> </el-select></el-form-item></el-col>
|
||||||
<el-col :span="4">
|
<el-col :span="4">
|
||||||
<el-form-item :label="'展示层数'" prop="level">
|
<el-form-item :label="'展示层数'" prop="level">
|
||||||
<el-input
|
<el-input-number
|
||||||
v-model="queryParams.level"
|
v-model="queryParams.level"
|
||||||
|
style="width: 100%"
|
||||||
clearable
|
clearable
|
||||||
|
:min="1"
|
||||||
|
:max="10"
|
||||||
|
:step="1"
|
||||||
|
:controls="false"
|
||||||
/></el-form-item></el-col>
|
/></el-form-item></el-col>
|
||||||
<el-col :span="4" style="margin-left: 30px">
|
<el-col :span="4" style="margin-left: 30px">
|
||||||
<div class="searchbox">
|
<div class="searchbox">
|
||||||
|
|
|
@ -36,10 +36,17 @@
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="4">
|
<el-col :span="4">
|
||||||
<el-form-item :label="'展示层数'" prop="level">
|
<el-form-item :label="'展示层数'" prop="level">
|
||||||
<el-input
|
<el-input-number
|
||||||
v-model="queryParams.level"
|
v-model="queryParams.level"
|
||||||
|
style="width: 100%"
|
||||||
clearable
|
clearable
|
||||||
/></el-form-item></el-col>
|
:min="1"
|
||||||
|
:max="10"
|
||||||
|
:step="1"
|
||||||
|
:controls="false"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
<el-col :span="4">
|
<el-col :span="4">
|
||||||
<el-form-item :label="'是否固定'" prop="cantz">
|
<el-form-item :label="'是否固定'" prop="cantz">
|
||||||
<el-select v-model="cantz" clearable :placeholder="'请选择'">
|
<el-select v-model="cantz" clearable :placeholder="'请选择'">
|
||||||
|
|
|
@ -176,6 +176,8 @@ export default {
|
||||||
created() {
|
created() {
|
||||||
this.getSearch()
|
this.getSearch()
|
||||||
this.getOthers()
|
this.getOthers()
|
||||||
|
this.select.startTime = this.timeRange[0]
|
||||||
|
this.select.endTime = this.timeRange[1]
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
isLocalSymbol,
|
isLocalSymbol,
|
||||||
|
|
Loading…
Reference in New Issue