Merge remote-tracking branch 'origin/master'

wangqi

2021-03-15 811fc5e4e89c9a5222e895587bfa1c2e9fcc08f4

 src/components/panel/ToolBoxPanel.vue

@@ -9,7 +9,7 @@
      <el-row v-show="selectGroup" class="specific-tools-group">
        <el-popover
            placement="bottom"
            width="200"
            width=""
            trigger="click"
            :popper-class="'tools-panel-content'"
            v-for="(item,index) in menuList" :key="index"
@@ -41,6 +41,9 @@
// 标绘的可选择数据
import marker from '@assets/images/map-pages/icon/toolbox/map.png'
import line from '@assets/images/map-pages/icon/toolbox/line.png'
import polygonJ from '@assets/images/map-pages/icon/toolbox/polygon.png'
import polygonS from '@assets/images/map-pages/icon/toolbox/ju.png'
import polygonY from '@assets/images/map-pages/icon/toolbox/circle.png'

// import square from '@/assets/images/map-pages/icon/toolbox/square.png'
// 测量的方法
@@ -73,16 +76,19 @@
              icon: line
            },
            {
              index: '1-3',
              label: '圆形'
            },
            {
              index: '1-4',
              label: '多边形'
              label: '多边形',
              icon: polygonJ
            },
            {
              index: '1-5',
              label: '矩形'
              label: '矩形',
              icon: polygonS
            },
            {
              index: '1-3',
              label: '圆形',
              icon: polygonY
            }
          ]
        },