Commit 8d550eb9 authored by caicaicai's avatar caicaicai

修改

parent 0f394f0e
...@@ -87,6 +87,7 @@ export default { ...@@ -87,6 +87,7 @@ export default {
zuobianData:[], zuobianData:[],
toJavaCoordinates:[], toJavaCoordinates:[],
weilanName:[], weilanName:[],
areaColorData:[],
} }
}, },
...@@ -136,6 +137,7 @@ export default { ...@@ -136,6 +137,7 @@ export default {
let data1 = []; let data1 = [];
for(let key in res){ for(let key in res){
that.weilanName.push(key); that.weilanName.push(key);
that.areaColorData.push(res[key][0].color);
let arrays = []; let arrays = [];
res[key].forEach(function(item){ res[key].forEach(function(item){
var arr = []; var arr = [];
...@@ -145,6 +147,7 @@ export default { ...@@ -145,6 +147,7 @@ export default {
arrays.push(arr); arrays.push(arr);
}) })
data1.push(arrays) data1.push(arrays)
} }
that.zuobianData = data1 that.zuobianData = data1
//console.log("zuobianData",that.zuobianData); //console.log("zuobianData",that.zuobianData);
...@@ -203,7 +206,7 @@ export default { ...@@ -203,7 +206,7 @@ export default {
var graphicLayer = new mars3d.layer.GraphicLayer(); var graphicLayer = new mars3d.layer.GraphicLayer();
map.addLayer(graphicLayer); map.addLayer(graphicLayer);
initLayerManager(graphicLayer,that.weilanName[index]); initLayerManager(graphicLayer,that.weilanName[index]);
that.addGraphic_01(graphicLayer,item,that.weilanName[index]); that.addGraphic_01(graphicLayer,item,that.weilanName[index],that.areaColorData[index]);
}) })
//实时位置 //实时位置
...@@ -217,11 +220,11 @@ export default { ...@@ -217,11 +220,11 @@ export default {
this.$emit('onload', map) this.$emit('onload', map)
}, },
//围栏回显 //围栏回显
addGraphic_01(graphicLayer,positions,weilanName){ addGraphic_01(graphicLayer,positions,weilanName,color){
let graphic = new mars3d.graphic.PolygonEntity({ let graphic = new mars3d.graphic.PolygonEntity({
positions: positions, positions: positions,
style: { style: {
color: "red", color: color,
opacity: 0.5, opacity: 0.5,
outline: true, outline: true,
outlineWidth: 3, outlineWidth: 3,
......
...@@ -171,7 +171,7 @@ export default { ...@@ -171,7 +171,7 @@ export default {
// }) // })
}, },
//上传围栏数据 //上传围栏数据
uploaded(text){ uploaded(text,color){
let newData = [...this.toJavaCoordinates]; let newData = [...this.toJavaCoordinates];
newData.pop(); newData.pop();
// if(this.toJavaCoordinates.length == 0){ // if(this.toJavaCoordinates.length == 0){
...@@ -183,6 +183,7 @@ export default { ...@@ -183,6 +183,7 @@ export default {
let allObj = {}; let allObj = {};
allObj.name = text; allObj.name = text;
allObj.zuobiao = newData; allObj.zuobiao = newData;
allObj.color = color;
this.toJavaCoordinates = []; this.toJavaCoordinates = [];
//console.log(allObj); //console.log(allObj);
//发送添加电子围栏请求 //发送添加电子围栏请求
......
...@@ -146,6 +146,9 @@ export default { ...@@ -146,6 +146,9 @@ export default {
name: [ name: [
{required: true, message: '请输入区域名称', trigger: 'blur' } {required: true, message: '请输入区域名称', trigger: 'blur' }
], ],
areaclass: [
{required: true, message: '请选择所属类别', trigger: 'change' }
],
}, },
} }
...@@ -270,6 +273,14 @@ export default { ...@@ -270,6 +273,14 @@ export default {
}, },
//新增区域信息 //新增区域信息
reqAddItem(form, item){ reqAddItem(form, item){
let areaclass1 = item.areaclass;
let areaColor = '';
this.RegionalTypeData.forEach((obj1)=>{
if(obj1.classname == areaclass1){
areaColor = obj1.color;
}
})
let panduan1 = this.tableData.find((obj,index)=>{ let panduan1 = this.tableData.find((obj,index)=>{
return obj.name == item.name; return obj.name == item.name;
}) })
...@@ -284,7 +295,7 @@ export default { ...@@ -284,7 +295,7 @@ export default {
}else{ }else{
let lastData = {...item}; let lastData = {...item};
lastData.card = this.picFileName; lastData.card = this.picFileName;
this.$refs.mars3dViewerMapMethod.uploaded(lastData.name); //this.$refs.mars3dViewerMapMethod.uploaded(lastData.name);
HttpReq.truckDispatching.RegionalInformationAdd(lastData).then((res) => { HttpReq.truckDispatching.RegionalInformationAdd(lastData).then((res) => {
form.visible = false; form.visible = false;
if(res.code == 200){ if(res.code == 200){
...@@ -295,7 +306,7 @@ export default { ...@@ -295,7 +306,7 @@ export default {
}); });
this.loadData(); this.loadData();
this.$nextTick(()=>{ this.$nextTick(()=>{
this.$refs.mars3dViewerMapMethod.uploaded(lastData.name); this.$refs.mars3dViewerMapMethod.uploaded(lastData.name,areaColor);
}) })
}else{ }else{
this.$notify({ this.$notify({
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<div class="content"> <div class="content">
<el-table :data="tableData" v-loading="loading" border style="width:auto" :row-class-name="tableRowClassName"> <el-table :data="tableData" v-loading="loading" border style="width:auto" :row-class-name="tableRowClassName">
<el-table-column prop="classname" label="区域类别名称" align="center"></el-table-column> <el-table-column prop="classname" label="区域类别名称" align="center"></el-table-column>
<el-table-column prop="color" label="区域遮罩层颜色" align="center"></el-table-column> <el-table-column prop="color" label="区域遮罩层颜色" align="center" :formatter="colorChange"></el-table-column>
<el-table-column prop="createTime" label="日期" align="center"></el-table-column> <el-table-column prop="createTime" label="日期" align="center"></el-table-column>
<el-table-column label="操作" align="center" fixed="right"> <el-table-column label="操作" align="center" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -38,10 +38,10 @@ ...@@ -38,10 +38,10 @@
</el-form-item> </el-form-item>
<el-form-item label="区域遮罩层颜色" prop="color"> <el-form-item label="区域遮罩层颜色" prop="color">
<el-select v-model="form.item.color" placeholder="请选择区域遮罩层颜色" style="width:280px;"> <el-select v-model="form.item.color" placeholder="请选择区域遮罩层颜色" style="width:280px;">
<el-option label="蓝色" value="蓝色"></el-option> <el-option label="蓝色" value="blue"></el-option>
<el-option label="绿色" value="绿色"></el-option> <el-option label="绿色" value="green"></el-option>
<el-option label="红色" value="红色"></el-option> <el-option label="红色" value="red"></el-option>
<el-option label="黄色" value="黄色"></el-option> <el-option label="黄色" value="yellow"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -234,6 +234,10 @@ export default { ...@@ -234,6 +234,10 @@ export default {
this.loadData(); this.loadData();
}) })
}, },
//颜色转换
colorChange(row){
return row.color == 'blue' ? '蓝色' : row.color == 'green' ? '绿色' :row.color == 'red' ? '红色' : row.color == 'yellow' ? '黄色' : '';
},
} }
} }
</script> </script>
......
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