Merge remote-tracking branch 'origin/develop' into develop

yangdelong

2021-05-30 4adfa4774e09f3b388335bb8dee5dea518856e5b

 src/conf/layers/LayerPipeLines.js

@@ -16,11 +16,13 @@
    {
      code: 'rainline',
      name: '雨水线',
      sname: '管网',
      checked: false,
      sname: '雨水',
      checked: true,
      type: SERVICE_TYPE.WMS,
      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
      layerGroup: 'sewer:pipeline_group',
      typeName: 'sewer:pipeline',
      icon: 'sewers/雨水线.png',
      legendImage: '../.././assets/images/map/sewers/雨水线.png',
      color: '#0070ff',
      minZoom: 13,
      styles: {
@@ -28,7 +30,7 @@
        FILL_COLOR: '#0070ff'
      },
      filter: 'mediumtype = \'雨水\'',
      index: 1
      index: 20
    },
    {
      code: 'accidentline',
@@ -36,10 +38,18 @@
      sname: '事故水',
      checked: false,
      type: SERVICE_TYPE.WMS,
      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
      layerGroup: 'sewer:pipeline_group',
      typeName: 'sewer:pipeline',
      icon: 'sewers/事故水.png',
      minZoom: 13,
      // color: 'rgb(230, 76, 0)',
      color: '#E64C00',
      styles: {
        COLOR: '#E64C00',
        FILL_COLOR: '#E64C00'
      },
      filter: 'mediumtype = \'事故水\'',
      index: 1
      index: 20
    },
    {
      code: 'oilline',
@@ -47,7 +57,9 @@
      sname: '含油污水',
      checked: false,
      type: SERVICE_TYPE.WMS,
      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
      layerGroup: 'sewer:pipeline_group',
      typeName: 'sewer:pipeline',
      icon: 'sewers/含油污水.png',
      minZoom: 13,
      color: '#ffaa00',
      filter: 'mediumtype = \'含油污水\'',
@@ -55,7 +67,7 @@
        COLOR: '#ffaa00',
        FILL_COLOR: '#ffaa00'
      },
      index: 1
      index: 20
    },
    {
      code: 'saltline',
@@ -63,10 +75,17 @@
      sname: '含盐污水',
      checked: false,
      type: SERVICE_TYPE.WMS,
      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
      layerGroup: 'sewer:pipeline_group',
      typeName: 'sewer:pipeline',
      icon: 'sewers/含盐污水.png',
      minZoom: 13,
      color: '#FF7F7F',
      filter: 'mediumtype = \'含盐污水\'',
      index: 1
      styles: {
        COLOR: '#FF7F7F',
        FILL_COLOR: '#FF7F7F'
      },
      index: 20
    },
    {
      code: 'alkaliline',
@@ -74,10 +93,17 @@
      sname: '含碱污水',
      checked: false,
      type: SERVICE_TYPE.WMS,
      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
      layerGroup: 'sewer:pipeline_group',
      typeName: 'sewer:pipeline',
      icon: 'sewers/含碱污水.png',
      filter: 'mediumtype = \'含碱污水\'',
      minZoom: 10,
      index: 1
      color: '#E8BEFF',
      styles: {
        COLOR: '#E8BEFF',
        FILL_COLOR: '#E8BEFF'
      },
      index: 20
    },
    {
      code: 'sulfurline',
@@ -85,10 +111,17 @@
      sname: '含硫污水',
      checked: false,
      type: SERVICE_TYPE.WMS,
      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
      layerGroup: 'sewer:pipeline_group',
      typeName: 'sewer:pipeline',
      icon: 'sewers/含硫污水.png',
      filter: 'mediumtype = \'含硫污水\'',
      minZoom: 10,
      index: 1
      color: '',
      styles: {
        COLOR: '',
        FILL_COLOR: ''
      },
      index: 20
    },
    {
      code: 'lifeline',
@@ -96,10 +129,17 @@
      sname: '生活污水',
      checked: false,
      type: SERVICE_TYPE.WMS,
      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
      layerGroup: 'sewer:pipeline_group',
      typeName: 'sewer:pipeline',
      icon: 'sewers/生活污水.png',
      filter: 'mediumtype = \'生活污水\'',
      minZoom: 13,
      index: 1
      color: '#A8A800',
      styles: {
        COLOR: '#A8A800',
        FILL_COLOR: '#A8A800'
      },
      index: 20
    },
    {
      code: 'purifyline',
@@ -107,21 +147,35 @@
      sname: '净化水',
      checked: false,
      type: SERVICE_TYPE.WMS,
      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
      layerGroup: 'sewer:pipeline_group',
      typeName: 'sewer:pipeline',
      icon: 'sewers/净化水.png',
      filter: 'mediumtype = \'净化水\'',
      minZoom: 13,
      index: 1
      color: '#55FF00',
      styles: {
        COLOR: '#55FF00',
        FILL_COLOR: '#55FF00'
      },
      index: 20
    },
    {
      code: 'loopline',
      name: '循环水',
      sname: '循环水',
      type: SERVICE_TYPE.WMS,
      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
      layerGroup: 'sewer:pipeline_group',
      typeName: 'sewer:pipeline',
      icon: 'sewers/循环水.png',
      filter: 'mediumtype = \'循环水\'',
      checked: false,
      minZoom: 13,
      index: 1
      color: '#73FFDF',
      styles: {
        COLOR: '#73FFDF',
        FILL_COLOR: '#73FFDF'
      },
      index: 20
    },
    {
      code: 'buildline',
@@ -129,7 +183,9 @@
      sname: '生产污水',
      checked: false,
      type: SERVICE_TYPE.WMS,
      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
      layerGroup: 'sewer:pipeline_group',
      typeName: 'sewer:pipeline',
      icon: 'sewers/生产污水.png',
      filter: 'mediumtype = \'生产污水\'',
      minZoom: 13,
      color: '#a8a800',
@@ -137,7 +193,7 @@
        COLOR: '#a8a800',
        FILL_COLOR: '#a8a800'
      },
      index: 1
      index: 20
    }
  ]
}