注释地图工具组件和相关功能

src/components/common-comp-alarm-list/src/entry/CommonAlarm.vue

@@ -127,7 +127,7 @@ export default {
     isBase: {
       // 是否是基础版
       type: Boolean,
-      default: true
+      default: false
     },
     showAlarmNum: {
       type: Boolean,

src/components/common-comp-footer/src/entry/CommonFooter.vue

@@ -302,6 +302,13 @@ export default {
           id: 1,
           checked: true // 是否在菜单配置中选择
         },
+        // {
+        //   iconImg: require('../assets/radar.png'),
+        //   iconImgActive: require('../assets/radar_active.png'),
+        //   name: '雷达',
+        //   id: 2,
+        //   checked: true // 是否在菜单配置中选择
+        // },
         {
           iconImg: require('../assets/iot.png'),
           iconImgActive: require('../assets/iot_active.png'),
@@ -309,55 +316,48 @@ export default {
           id: 3,
           checked: true // 是否在菜单配置中选择
         },
-        {
-          iconImg: require('../assets/radar.png'),
-          iconImgActive: require('../assets/radar_active.png'),
-          name: '雷达',
-          id: 2,
-          checked: true // 是否在菜单配置中选择
-        },
-        {
-          iconImg: require('../assets/horn.png'),
-          iconImgActive: require('../assets/horn_active.png'),
-          name: '喇叭',
-          id: 5,
-          checked: true // 是否在菜单配置中选择
-        },
-        {
-          iconImg: require('../assets/drone.png'),
-          iconImgActive: require('../assets/drone_active.png'),
-          name: '无人机',
-          id: 4,
-          checked: true // 是否在菜单配置中选择
-        },
-        {
-          iconImg: require('../assets/recorder.png'),
-          iconImgActive: require('../assets/recorder_active.png'),
-          name: '执法记录仪',
-          id: 11,
-          checked: true // 是否在菜单配置中选择
-        },
-        {
-          iconImg: require('../assets/grid.png'),
-          iconImgActive: require('../assets/grid_active.png'),
-          name: '网格',
-          id: 6,
-          checked: true // 是否在菜单配置中选择
-        },
-        {
-          iconImg: require('../assets/grid-user.png'),
-          iconImgActive: require('../assets/grid-user_active.png'),
-          name: '网格员',
-          id: 7,
-          checked: true // 是否在菜单配置中选择
-        },
-        {
-          iconImg: require('../assets/resource.png'),
-          iconImgActive: require('../assets/resource_active.png'),
-          name: '资源',
-          id: 8,
-          checked: true // 是否在菜单配置中选择
-        }
+        // {
+        //   iconImg: require('../assets/horn.png'),
+        //   iconImgActive: require('../assets/horn_active.png'),
+        //   name: '喇叭',
+        //   id: 5,
+        //   checked: true // 是否在菜单配置中选择
+        // },
+        // {
+        //   iconImg: require('../assets/drone.png'),
+        //   iconImgActive: require('../assets/drone_active.png'),
+        //   name: '无人机',
+        //   id: 4,
+        //   checked: true // 是否在菜单配置中选择
+        // },
+        // {
+        //   iconImg: require('../assets/recorder.png'),
+        //   iconImgActive: require('../assets/recorder_active.png'),
+        //   name: '执法记录仪',
+        //   id: 11,
+        //   checked: true // 是否在菜单配置中选择
+        // },
+        // {
+        //   iconImg: require('../assets/grid.png'),
+        //   iconImgActive: require('../assets/grid_active.png'),
+        //   name: '网格',
+        //   id: 6,
+        //   checked: true // 是否在菜单配置中选择
+        // },
+        // {
+        //   iconImg: require('../assets/grid-user.png'),
+        //   iconImgActive: require('../assets/grid-user_active.png'),
+        //   name: '网格员',
+        //   id: 7,
+        //   checked: true // 是否在菜单配置中选择
+        // },
+        // {
+        //   iconImg: require('../assets/resource.png'),
+        //   iconImgActive: require('../assets/resource_active.png'),
+        //   name: '资源',
+        //   id: 8,
+        //   checked: true // 是否在菜单配置中选择
+        // }
       ],
 
       zIndex: 100, // 提供设备树弹窗层级控制
@@ -369,7 +369,7 @@ export default {
     defaultKeys: {
       type: Array,
       default() {
-        return [1, 3, 2, 5, 4, 11, 8, 6, 7]
+        return [1, 3]
       }
     },
     isAllOpen: {

src/components/common-comp-iot-tree/src/entry/CommonIotTree.vue

@@ -58,15 +58,15 @@
             }`"
             @click="showFilterBox"
           ></i>
-          <i
-            class="menu-wh"
-            :class="`iconfont_tools ${
-              functionList.find((item) => item.id == '3').isShowCollect
-                ? 'clickCol icon-icon_shoucang_20_s'
-                : 'icon-icon_shoucang_20_n'
-            }`"
-            @click="showCollectData('3')"
-          ></i>
+<!--          <i-->
+<!--            class="menu-wh"-->
+<!--            :class="`iconfont_tools ${-->
+<!--              functionList.find((item) => item.id == '3').isShowCollect-->
+<!--                ? 'clickCol icon-icon_shoucang_20_s'-->
+<!--                : 'icon-icon_shoucang_20_n'-->
+<!--            }`"-->
+<!--            @click="showCollectData('3')"-->
+<!--          ></i>-->
         </div>
         <!-- 筛选框 -->
         <div v-show="isShowFilterBox" class="filterBox">

src/views/allAlarm.vue

@@ -27,9 +27,9 @@
       <div class="searchrow">
 
 <!--        <DSearchMap toolBoxMemoryName="allAlarmSettingMap" :class="['rowitem', 'searchmapp', alarmDetailOpen && 'alarmNavipotision', (naviRightPosition || showLandInspection || showVideoInspection) && 'navipotision']" :mapId="mapId" />-->
-        <div class="rowitem" style="position: relative;">
-          <DMultipleDeviceSearch style="position: static;" :mapId="mapId" />
-        </div>
+<!--        <div class="rowitem" style="position: relative;">-->
+<!--          <DMultipleDeviceSearch style="position: static;" :mapId="mapId" />-->
+<!--        </div>-->
 <!--        <div class="rowitem" style="position: relative;">-->
 <!--          <DCameraCircleSelection :mapId="mapId" />-->
 <!--        </div>-->
@@ -63,16 +63,16 @@
         placement="left"
       ><div :class="['alarmimg', showAlarmList && 'active']" /></el-tooltip>
     </div>
-    <div>
-      <el-tooltip
-        popper-class="common-tooltips"
-        effect="dark"
-        content="巡查任务列表"
-        placement="left"
-      >
-        <div :class="['inspection-task-list', showInspectionTask&&'active', showAlarmList&&'showAlarmList']" @click="inspectionTaskFn" />
-      </el-tooltip>
-    </div>
+<!--    <div>-->
+<!--      <el-tooltip-->
+<!--        popper-class="common-tooltips"-->
+<!--        effect="dark"-->
+<!--        content="巡查任务列表"-->
+<!--        placement="left"-->
+<!--      >-->
+<!--        <div :class="['inspection-task-list', showInspectionTask&&'active', showAlarmList&&'showAlarmList']" @click="inspectionTaskFn" />-->
+<!--      </el-tooltip>-->
+<!--    </div>-->
 
     <DToolBox
       :class="['tool-box', (showInspectionTask || showAlarmList) && 'fix-map-tool']"