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

chenyabin

2021-04-08 a7b7b5f1f85bd30b171e17056bf9ae9830fb36cb

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

# Conflicts:
#	src/components/LayerController/logic/Company.js

 .DS_Store

Binary files differ

 .gitignore

@@ -29,4 +29,4 @@
.DS_Store
package-lock.json
.idea
.dist
/dist

 public/assets/.DS_Store

Binary files differ

 public/assets/images/.DS_Store

Binary files differ

 public/assets/images/map-pages/.DS_Store

Binary files differ

 public/assets/images/map-pages/icon/.DS_Store

Binary files differ

 src/.DS_Store

Binary files differ

 src/assets/.DS_Store

Binary files differ

 src/assets/css/map/map-panel-style.less

@@ -321,15 +321,15 @@
  list-style: none;
  margin: 0;
  padding: 0;
  width: 260px;
  display: flex;
  //width: 260px;
  //display: flex;
  flex-wrap: wrap;
}

.company-bindTooltip-hover ul li {
  margin: 0;
  padding: 3px 0;
  width: 50%;
  //width: 50%;
}

/*************** PublicTable 表格样式。*********************************/

 src/assets/images/.DS_Store

Binary files differ

 src/assets/images/map-pages/.DS_Store

Binary files differ

 src/assets/images/map-pages/icon/.DS_Store

Binary files differ

 src/components/LayerController/service/WfsLayerService.js

@@ -45,9 +45,9 @@
          fillColor: STYLES.FILL_COLOR,
          color: STYLES.COLOR,
          fillOpacity: STYLES.FILL_OPACITY,
          opacity: STYLES.OPACITY,
          dashArray: STYLES.DASH_ARRAY,
          dashSpeed: STYLES.DASH_SPPED
          opacity: STYLES.OPACITY
          // dashArray: STYLES.DASH_ARRAY,
          // dashSpeed: STYLES.DASH_SPPED
        }
      },
      pointToLayer: (geoJsonPoint, latlng) => {

 src/components/panel/BaseNavMenuItem.vue

 src/components/panel/bounced/TextBounced.vue

 src/components/plugin/DownLoad.js

 src/components/plugin/FullScreen.js

 src/components/plugin/MakeTation.js

 src/components/plugin/MeaSure.js

 src/components/plugin/leaflet-measure-path/leaflet-measure-path.css

 src/components/plugin/leaflet-measure-path/leaflet-measure-path.js

 src/conf/Constants.js

@@ -20,7 +20,7 @@
  OPACITY: 1,
  DASH_ARRAY: '4,4',
  DASH_SPPED: -5,
  ICON_SIZE: [20, 20]
  ICON_SIZE: [10, 10]
}

export const props = {