移除自定义的是否支持云台属性

web/src/views/common/CommonChannelEdit.vue

@@ -204,7 +204,6 @@
           </el-select>
         </el-form-item>
         <el-form-item >
-          <el-checkbox v-model="form.enablePtzForBool" >云台控制(非标属性)</el-checkbox>
           <el-checkbox v-model="form.enableBroadcastForBool" >语音对讲(非标属性)</el-checkbox>
         </el-form-item>
 
@@ -259,7 +258,6 @@ export default {
       if (this.form.gbDownloadSpeedArray) {
         this.form.gbDownloadSpeed = this.form.gbDownloadSpeedArray.join('/')
       }
-      this.form.enablePtz = this.form.enablePtzForBool ? 1 : 0
       this.form.enableBroadcast = this.form.enableBroadcastForBool ? 1 : 0
       if (this.form.gbId) {
         this.$store.dispatch('commonChanel/update', this.form)
@@ -328,7 +326,6 @@ export default {
             data.gbDownloadSpeedArray = data.gbDownloadSpeed.split('/')
           }
           this.form = data
-          this.$set(this.form, 'enablePtzForBool', this.form.enablePtz === 1)
           this.$set(this.form, 'enableBroadcastForBool', this.form.enableBroadcast === 1)
         })
         .finally(() => {

web/src/views/map/index.vue

@@ -4,7 +4,7 @@
         <DeviceTree ref="deviceTree" @clickEvent="treeChannelClickEvent" :showPosition="true" :contextmenu="getContextmenu()"/>
         <MapComponent ref="mapComponent" @loaded="initChannelLayer" @coordinateSystemChange="initChannelLayer"></MapComponent>
       </div>
-      <div class="map-tool-box">
+      <div class="map-tool-box-bottom-right">
         <div class="map-tool-btn-group">
           <el-dropdown placement="top"  @command="changeMapTile">
             <div class="el-dropdown-link map-tool-btn">
@@ -29,7 +29,29 @@
             <i class="iconfont icon-minus1"></i>
           </div>
         </div>
-
+      </div>
+      <div class="map-tool-box-top-left">
+        <div class="map-tool-btn-group">
+          <div class="map-tool-btn" title="图层抽稀">
+            <i class="iconfont icon-mti-sandian"></i> <span>图层抽稀</span>
+          </div>
+<!--          <div class="map-tool-btn" title="位置编辑">-->
+<!--            <i class="el-icon-edit"></i> <span>位置编辑</span>-->
+<!--          </div>-->
+        </div>
+      </div>
+      <div class="map-tool-box-top-right">
+        <div class="map-tool-btn-group">
+          <div class="map-tool-btn" title="抽稀">
+            <i class="iconfont icon-mti-sandian"></i>
+          </div>
+          <div class="map-tool-btn" title="聚合">
+            <i class="iconfont icon-mti-jutai"></i>
+          </div>
+          <div class="map-tool-btn" title="默认">
+            <i class="iconfont icon-mti-jutai"></i>
+          </div>
+        </div>
       </div>
       <div ref="infobox">
         <transition name="el-zoom-in-center">
@@ -370,11 +392,21 @@ export default {
 </script>
 
 <style>
-.map-tool-box {
+.map-tool-box-bottom-right {
   position: absolute;
   right: 20px;
   bottom: 20px;
 }
+.map-tool-box-top-right {
+  position: absolute;
+  right: 20px;
+  top: 20px;
+}
+.map-tool-box-top-left {
+  position: absolute;
+  left: 380px;
+  top: 20px;
+}
 .map-tool-btn-group {
   background-color: #FFFFFF;
   border-radius: 3px;
@@ -382,9 +414,23 @@ export default {
   box-shadow: 0 2px 2px rgba(0, 0, 0, .15);
   margin-bottom: 10px;
 }
+.map-tool-box-top-left .map-tool-btn-group {
+  display: flex;
+}
+.map-tool-box-top-right .map-tool-btn-group {
+  display: flex;
+}
+.map-tool-box-top-left .map-tool-btn {
+  padding: 0 10px;
+}
+.map-tool-box-top-right .map-tool-btn {
+  padding: 0 10px;
+}
 .map-tool-btn {
   border-bottom: 1px #dfdfdf solid;
-  width: 33px;
+  border-right: 1px #dfdfdf solid;
+  width: fit-content;
+  min-width: 33px;
   height: 36px;
   cursor: pointer;
   text-align: center;
@@ -396,6 +442,7 @@ export default {
 }
 .map-tool-btn-group:last-child {
   border-bottom: none;
+  border-right: none;
 }
 
 .infobox-content{