diff --git a/src/views/pictureOnMap/LayerControl.vue b/src/views/pictureOnMap/LayerControl.vue index 634846e..694822a 100644 --- a/src/views/pictureOnMap/LayerControl.vue +++ b/src/views/pictureOnMap/LayerControl.vue @@ -256,7 +256,7 @@ pipeNetworkFilling:{ title:'管网充满度(%)', data:[ - { name: "0-60", color: "rgba(52,176,0,1)" }, + { name: "0-60", color: "rgba(52,176,0,.1)" }, { name: "60-70", color: "rgba(254,203,0,1)" }, { name: "70-90", color: "rgba(223,1,0,1)" }, { name: ">90", color: "rgba(142,14,11,1)" }, @@ -630,7 +630,7 @@ width:12px; height:12px; margin-right: 5px; - } + } diff --git a/src/views/pictureOnMap/LayerControl.vue b/src/views/pictureOnMap/LayerControl.vue index 634846e..694822a 100644 --- a/src/views/pictureOnMap/LayerControl.vue +++ b/src/views/pictureOnMap/LayerControl.vue @@ -256,7 +256,7 @@ pipeNetworkFilling:{ title:'管网充满度(%)', data:[ - { name: "0-60", color: "rgba(52,176,0,1)" }, + { name: "0-60", color: "rgba(52,176,0,.1)" }, { name: "60-70", color: "rgba(254,203,0,1)" }, { name: "70-90", color: "rgba(223,1,0,1)" }, { name: ">90", color: "rgba(142,14,11,1)" }, @@ -630,7 +630,7 @@ width:12px; height:12px; margin-right: 5px; - } + } diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index c3dab83..c726c59 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -104,6 +104,8 @@ 'plcSewagePumpStation', //plc污水泵站 'plcRainPumpStation', //plc雨水泵站 "plcGateStation",//plc水闸 + + ]); // 基本数据 const arrid = ref([ @@ -452,7 +454,20 @@ // 处理标注 Getproperties.value = properties; - let type = properties ? properties.type : '' || 1; + let type = properties ? properties.type : '' || 1; + // 针对调度辅助决策易渍水点做的判断 + let fzjcArr=['waterlog_community_text','waterloggingPointRelation'] + if(fzjcArr.includes(properties.type)){ + // 调度辅助决策易渍水点上图统一类型 + type=properties._image + if(!Object.keys(properties).includes('stCode')){ + properties.stCode=properties.dataCode + } + if(!Object.keys(properties).includes('id')){ + properties.id=properties.dataId + } + } + let Name = properties ? properties.pointTypeName : '' || ''; // Annotation(properties); console.log('1111', type, layerId);