Merge branch 'master' of http://39.105.126.192:3000/yylc_sh/web_sh_audit

src/components/common/BottomForm/SameScreenComparison.vue

@@ -125,7 +125,7 @@
       </div>
     </div>
     <span slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="startMapLabelCase()">标记疑点</el-button>
+      <!-- <el-button type="primary" @click="startMapLabelCase()">标记疑点</el-button> -->
       <el-button @click="clearDialogVisible()">取 消</el-button>
       <el-button type="primary" @click="subMitDialogVisible()">打 印</el-button>
     </span>

src/components/map/Legend.vue

@@ -53,7 +53,7 @@
                   </span>
                   <el-dropdown-menu slot="dropdown">
                     <!-- <el-dropdown-item icon="el-icon-edit" @click="updateColor()">修改颜色</el-dropdown-item> -->
-                    <el-dropdown-item icon="el-icon-delete" :command="item.name">删除图例</el-dropdown-item>
+                    <el-dropdown-item icon="el-icon-delete" :command="item.name">关闭图层</el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
                 <span v-else>{{ item.name }}</span>