Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetw...

ChenZeping

2021-05-11 4e4770fafafb63a593293c234fd23db78faefaae

 src/conf/layers/LayerPipeLines.js

@@ -19,7 +19,7 @@
      sname: '管网',
      checked: false,
      type: SERVICE_TYPE.WMS,
      typeName: 'sewer:pipeline',
      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
      icon: 'sewers/雨水线.png',
      color: '#0070ff',
      minZoom: 13,
@@ -36,7 +36,7 @@
      sname: '事故水',
      checked: false,
      type: SERVICE_TYPE.WMS,
      typeName: 'sewer:pipeline',
      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
      minZoom: 13,
      filter: 'mediumtype = \'事故水\'',
      index: 1
@@ -47,10 +47,10 @@
      sname: '含油污水',
      checked: false,
      type: SERVICE_TYPE.WMS,
      typeName: 'sewer:pipeline',
      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
      minZoom: 13,
      color: '#ffaa00',
      filter: 'mediumtype = \'含油\'',
      filter: 'mediumtype = \'含油污水\'',
      styles: {
        COLOR: '#ffaa00',
        FILL_COLOR: '#ffaa00'
@@ -63,9 +63,9 @@
      sname: '含盐污水',
      checked: false,
      type: SERVICE_TYPE.WMS,
      typeName: 'sewer:pipeline',
      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
      minZoom: 13,
      filter: 'mediumtype = \'含盐\'',
      filter: 'mediumtype = \'含盐污水\'',
      index: 1
    },
    {
@@ -74,8 +74,8 @@
      sname: '含碱污水',
      checked: false,
      type: SERVICE_TYPE.WMS,
      typeName: 'sewer:pipeline',
      filter: 'mediumtype = \'含碱\'',
      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
      filter: 'mediumtype = \'含碱污水\'',
      minZoom: 10,
      index: 1
    },
@@ -85,8 +85,8 @@
      sname: '含硫污水',
      checked: false,
      type: SERVICE_TYPE.WMS,
      typeName: 'sewer:pipeline',
      filter: 'mediumtype = \'含硫\'',
      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
      filter: 'mediumtype = \'含硫污水\'',
      minZoom: 10,
      index: 1
    },
@@ -96,7 +96,7 @@
      sname: '生活污水',
      checked: false,
      type: SERVICE_TYPE.WMS,
      typeName: 'sewer:pipeline',
      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
      filter: 'mediumtype = \'生活污水\'',
      minZoom: 13,
      index: 1
@@ -107,7 +107,7 @@
      sname: '净化水',
      checked: false,
      type: SERVICE_TYPE.WMS,
      typeName: 'sewer:pipeline',
      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
      filter: 'mediumtype = \'净化水\'',
      minZoom: 13,
      index: 1
@@ -117,7 +117,7 @@
      name: '循环水',
      sname: '循环水',
      type: SERVICE_TYPE.WMS,
      typeName: 'sewer:pipeline',
      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
      filter: 'mediumtype = \'循环水\'',
      checked: false,
      minZoom: 13,
@@ -129,7 +129,7 @@
      sname: '生产污水',
      checked: false,
      type: SERVICE_TYPE.WMS,
      typeName: 'sewer:pipeline',
      typeName: 'sewer:pipeline,sewer:pipenetwork,sewer:pipesegment',
      filter: 'mediumtype = \'生产污水\'',
      minZoom: 13,
      color: '#a8a800',