Browse Source

网格开通情况,议题数显示重复的两列 bug修复

master
songyunpeng 6 years ago
parent
commit
be81c35f4c
  1. 25
      src/views/modules/analysis/user/party.vue
  2. 39
      src/views/modules/analysis/user/register.vue

25
src/views/modules/analysis/user/party.vue

@ -21,10 +21,10 @@
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期"> end-placeholder="结束日期">
</el-date-picker> &nbsp; &nbsp; </el-date-picker> &nbsp; &nbsp;
<el-form-item label="年龄排序"> <el-form-item label="排序规则">
<el-select v-model="dataForm.category" <el-select v-model="dataForm.category"
clearable clearable
placeholder="年龄排序"> placeholder="排序规则">
<el-option v-for="item in categorys" <el-option v-for="item in categorys"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
@ -32,18 +32,6 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="注册排序">
<el-select v-model="dataForm.registerCount"
clearable
placeholder="注册排序">
<el-option v-for="item in registerCounts"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button> <el-button @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item> </el-form-item>
@ -175,15 +163,12 @@ export default {
}, { }, {
value: '3', value: '3',
label: '50岁以下最少人数' label: '50岁以下最少人数'
} }, {
], value: '7',
registerCounts: [
{
value: '0',
label: '注册人数最多' label: '注册人数最多'
}, },
{ {
value: '1', value: '8',
label: '注册人数最少' label: '注册人数最少'
} }
], ],

39
src/views/modules/analysis/user/register.vue

@ -21,10 +21,10 @@
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期"> end-placeholder="结束日期">
</el-date-picker> &nbsp; &nbsp; </el-date-picker> &nbsp; &nbsp;
<el-form-item label="类别"> <el-form-item label="排序规则">
<el-select v-model="dataForm.category" <el-select v-model="dataForm.category"
clearable clearable
placeholder="所属类别"> placeholder="排序规则">
<el-option v-for="item in categorys" <el-option v-for="item in categorys"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
@ -32,18 +32,6 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="注册排序">
<el-select v-model="dataForm.registerCount"
clearable
placeholder="注册排序">
<el-option v-for="item in registerCounts"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button> <el-button @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item> </el-form-item>
@ -188,21 +176,16 @@ export default {
}, { }, {
value: '3', value: '3',
label: '50岁以下最少人数' label: '50岁以下最少人数'
}, {
value: '4',
label: '注册用户最多'
}, {
value: '5',
label: '注册党员最多'
}, {
value: '6',
label: '注册居民最多'
}], }],
registerCounts: [
{
value: '2',
label: '注册用户最多'
},
{
value: '3',
label: '注册党员最多'
},
{
value: '4',
label: '注册居民最多'
}
],
onLine: { onLine: {
id: '', id: '',
onLineState: '' onLineState: ''

Loading…
Cancel
Save