Commit a6e1d27c authored by 沈良进's avatar 沈良进

页面修改

parent 6d84c47f
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
<div class="tripmap-form marginT20" v-if="PostConfig" v-loading="pageLoading"> <div class="tripmap-form marginT20" v-if="PostConfig" v-loading="pageLoading">
<div class="tripmap-Search"> <div class="tripmap-Search">
<div style="display: flex;align-items: start; justify-content: space-between;"> <div style="display: flex;align-items: start; justify-content: space-between;">
<div style="display: flex;flex-wrap: wrap; flex-grow: 1;"> <div style="">
<el-select style="width:300px;" placeholder="选择国家" v-model="chooseCountry" <el-select style="width:300px;" placeholder="选择国家" v-model="chooseCountry"
@change="chagneCountry(),SearchCity()" filterable multiple=""> @change="chagneCountry(),SearchCity()" filterable multiple="">
<el-option v-for="(item, i) in SourceCountryList" :label="item.Name" :value="item.ID" :key="i"> <el-option v-for="(item, i) in SourceCountryList" :label="item.Name" :value="item.ID" :key="i">
</el-option> </el-option>
</el-select> </el-select>
<el-select style="width:300px;margin-left: 5px;margin-right: 5px;" placeholder="选择城市" v-model="chooseCity" <el-select style="width:500px;margin-left: 5px;margin-right: 5px;" placeholder="选择城市" v-model="chooseCity"
multiple filterable @change="changeCity()"> multiple filterable @change="changeCity()">
<el-option v-for="(item, i) in SourceCityList" :label="item.Name" :value="item.ID" :key="i"> <el-option v-for="(item, i) in SourceCityList" :label="item.Name" :value="item.ID" :key="i">
</el-option> </el-option>
...@@ -180,7 +180,6 @@ ...@@ -180,7 +180,6 @@
this.getMapData(); this.getMapData();
}); });
}, },
//获取地图数据 //获取地图数据
async getMapData() { async getMapData() {
await this.assemblingMapData(); await this.assemblingMapData();
...@@ -486,11 +485,17 @@ ...@@ -486,11 +485,17 @@
if (x.MId != 651 && x.MId != 891) { if (x.MId != 651 && x.MId != 891) {
that.ClearSource("mapLayer-" + x.MId, 1) that.ClearSource("mapLayer-" + x.MId, 1)
that.ClearSource("mapLayerId-" + x.MId, 1) that.ClearSource("mapLayerId-" + x.MId, 1)
var tempColor = "";
if (i == 0) {
tempColor = x.ColorStr
} else {
tempColor = this.getRandomColor();
}
this.map && this.map.setPaintProperty("world-layer-" + x.MId, "fill-color", [ this.map && this.map.setPaintProperty("world-layer-" + x.MId, "fill-color", [
"match", "match",
["get", "NAME_ZH"], ["get", "NAME_ZH"],
x.name, x.name,
x.ColorStr, // 选定的国家颜色 tempColor, // 选定的国家颜色
["rgba", 0, 122, 255, 0] ["rgba", 0, 122, 255, 0]
]); ]);
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment