Commit f4f55c51 authored by youjie's avatar youjie

no message

parent e1bb7525
......@@ -166,7 +166,9 @@ export default {
],
"fill-outline-color": "#4f4f4f",
"fill-opacity": 0.5
}
},
paintRbBgList: [],
paintHgBgList: []
};
},
watch: {
......@@ -329,7 +331,8 @@ export default {
MId: x.MId,
ColorStr: x.ColorStr,
Lng: x.Lng,
Lat: x.Lat
Lat: x.Lat,
CityListAll: x.CityListAll
};
listCountries.push(x.MName);
let tempI = this.countriesData.findIndex(y=>y.MName==x.MName)
......@@ -375,6 +378,7 @@ export default {
if(x.MName==y.MName){
y.Lng = x.Lng
y.Lat = x.Lat
y.CityListAll = x.CityListAll
}
})
if (x.MId) {
......@@ -444,6 +448,7 @@ export default {
var path = `/Upload/Temporary`;
that.uploadSelfBlob(path, newArr, postJson, x => {
if (x.data.StatusCode == 1) {
that.SavePositionStr()
that.setLoading = false;
let allPath = that.domainManager().ViittoFileUrl + x.data.FilePath;
that.dataAll.Mapurl = allPath;
......@@ -594,6 +599,12 @@ export default {
item.CityList.map(items => {
item.CityListIds.push(items.MId);
});
item.CityListAll.forEach(x=>{
let obj = [
["==",["get","name"],x.MName],this.getRandomColor(),
]
})
}
});
this.$forceUpdate();
......@@ -602,17 +613,60 @@ export default {
);
},
addCountryFillRange() {
let that = this
that.paintRbBgList = []
for(let i=0;i<1000;i++){
let obj = [i, that.getRandomColor()]
that.paintRbBgList.push(obj)
}
this.countriesData.forEach((x, i) => {
if (x.MName == "中国") x.MName = "中华人民共和国";
if (x.MName == "韩国") x.MName = "大韩民国";
x.CityListAll.forEach(y=>{
})
let source
var paintBgObj
if(x.MId!=651&&x.MId!=891){
source = "word-source"
}else{
if(x.MId==651)
{ source = "word-source-japan"; paintBgObj = this.paintRbBgObj
}else { source = "word-source-Korea"; paintBgObj = this.paintHgBgObj}
{ source = "word-source-japan";
paintBgObj = {
"fill-color": {
'property': 'cartodb_id',
stops: that.paintRbBgList
},
"fill-outline-color": "#4f4f4f",
"fill-opacity": 0.5
}
}else { source = "word-source-Korea";
paintBgObj = { //设置属性
"fill-color": [
"case",
["==",["get","name"],"江原道"],that.getRandomColor(),
["==",["get","name"],"京畿道"],that.getRandomColor(),
["==",["get","name"],"庆尚南道"],that.getRandomColor(),
["==",["get","name"],"庆尚北道"],that.getRandomColor(),
["==",["get","name"],"全罗南道"],that.getRandomColor(),
["==",["get","name"],"全罗北道"],that.getRandomColor(),
["==",["get","name"],"忠清南道"],that.getRandomColor(),
["==",["get","name"],"忠清北道"],that.getRandomColor(),
["==",["get","name"],"光州广域市"],that.getRandomColor(),
["==",["get","name"],"大邱广域市"],that.getRandomColor(),
["==",["get","name"],"大田广域市"],that.getRandomColor(),
["==",["get","name"],"釜山广域市"],that.getRandomColor(),
["==",["get","name"],"首尔特别市"],that.getRandomColor(),
["==",["get","name"],"蔚山广域市"],that.getRandomColor(),
["==",["get","name"],"仁川广域市"],that.getRandomColor(),
["==",["get","name"],"世宗特别自治市"],that.getRandomColor(),
["==",["get","name"],"济州特别自治道"],that.getRandomColor(),
that.getRandomColor()
],
"fill-outline-color": that.getRandomColor(),
"fill-opacity": 0.5
}
}
}
this.map.addLayer({
id: "world-layer-" + x.MId,
......@@ -656,6 +710,9 @@ export default {
}
});
},
getCityListColor(CityListAll){
},
clearCitiesMarkersHandler() {
if (this.deviceMarkers && this.deviceMarkers.length > 0) {
......
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