Merge remote-tracking branch 'origin/master'

This commit is contained in:
710356044
2022-01-04 16:21:56 +08:00

View File

@@ -23,12 +23,12 @@
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<!-- <a-col :lg="6" :md="12" :sm="24" :xs="24"> <a-col :lg="6" :md="12" :sm="24" :xs="24">
<a-form-item label="区域:"> <a-form-item label="区域:">
<a-select mode="multiple" v-model:value="queryParams.areaList" :options="areaOptions" placeholder="请选择区域"> <a-select mode="multiple" v-model:value="queryParams.areaList" :options="areaOptions" placeholder="请选择区域">
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> --> </a-col>
<a-col :lg="6" :md="12" :sm="24" :xs="24"> <a-col :lg="6" :md="12" :sm="24" :xs="24">
<a-form-item label="测点名称:"> <a-form-item label="测点名称:">
<a-select mode="multiple" v-model:value="queryParams.placeList" :options="placeOptions" placeholder="请选择测点名称"> <a-select mode="multiple" v-model:value="queryParams.placeList" :options="placeOptions" placeholder="请选择测点名称">
@@ -86,8 +86,8 @@
return { return {
queryParams: { queryParams: {
yearList: ["2021"], yearList: ["2021"],
areaList: [], areaList: ['南宁市'],
placeList: ['广西大学'], // 测点名称 placeList: [], // 测点名称
quarterList: [], // 季度 quarterList: [], // 季度
regionLevel: '市级', // 区域等级 regionLevel: '市级', // 区域等级
xco: '年度' ,// 横坐标 xco: '年度' ,// 横坐标
@@ -187,6 +187,7 @@
value: item.dictDataName, value: item.dictDataName,
}; };
}); });
this.areaOptions.unshift({ label: '所有县', value: '所有县'})
}) })
}, },
// 测点名称下拉列表 // 测点名称下拉列表