CN-1717 feat: location map 增加 source 过滤条件，基站增加一层cell结构并新增对应交互

public/assets/tagTemplate.csv

@@ -4,3 +4,4 @@ IP,192.168.1.1-192.168.1.2
 IP,103.3.138.0
 Domain,$www.baidu.com
 Domain,*.email.baidu.com
+Subscriber,41582263

src/assets/css/components/views/charts2/entityDetailSubscriberMap.scss

@@ -426,7 +426,7 @@ $color-highlight: #CC4444;
 
       .hexagon-tooltip__body {
         .body__item .item__label {
-          width: 140px;
+          width: 80px;
         }
       }
     }

src/assets/css/components/views/location/location.scss

@@ -7,6 +7,7 @@ $color-primary: var(--el-color-primary);
 $color-human: #233447; // 以下是颜色暂无替代的
 $color-circle: #DE3434;
 $color-base-station: #585B5F;
+$color-cell: #586A7F;
 $color-search-follow: #6f6f6e;
 $color-highlight: #CC4444;
 
@@ -36,7 +37,7 @@ $color-highlight: #CC4444;
   .location-tabs {
     .traceTracking-tabs_label {
       display: flex;
-      flex-display: row;
+
 
       .traceTracking-num {
         margin-top: 5px;
@@ -175,7 +176,7 @@ $color-highlight: #CC4444;
         width: 20px;
         height: 20px;
         border-radius: 50%;
-        cursor: default;
+        cursor: pointer;
         padding: 0;
         transition: height .1s linear, width .1s linear;
 
@@ -186,7 +187,6 @@ $color-highlight: #CC4444;
 
         &.map-marker--human {
           background-color: $color-human;
-          cursor: pointer;
 
           svg {
             width: 14px;
@@ -203,6 +203,16 @@ $color-highlight: #CC4444;
           }
         }
 
+        &.map-marker--cell {
+          border: 1px solid $color-white;
+          background-color: $color-cell;
+
+          svg {
+            width: 12px;
+            height: 12px;
+          }
+        }
+
         &.map-marker--hover {
           width: 30px;
           height: 30px;
@@ -215,9 +225,11 @@ $color-highlight: #CC4444;
             height: 21px;
           }
 
-          &.map-marker--base-station svg {
+          &.map-marker--base-station, &.map-marker--cell {
-            width: 18px;
+            svg {
-            height: 18px;
+              width: 18px;
+              height: 18px;
+            }
           }
         }
 
@@ -233,6 +245,14 @@ $color-highlight: #CC4444;
             width: 21px;
             height: 21px;
           }
+          &.map-marker--base-station {
+            background-color: $color-base-station;
+
+            svg {
+              width: 18px;
+              height: 18px;
+            }
+          }
         }
 
         &.map-marker--hidden, &.map-marker--unfollowed {
@@ -358,77 +378,24 @@ $color-highlight: #CC4444;
           align-items: center;
           font-size: 12px;
         }
-      }
+        .input-to-select {
-      /*.analysis-statistics__search {
+          .el-input__wrapper {
-        margin-bottom: 10px;
+            display: none;
-        padding-left: 10px;
-        .el-select {
-          .search-active {
-            float: left;
-            border-radius: 3px;
-            width: 6px;
-            height: 6px;
-            margin-right: 10px;
-            position: relative;
-            top: 50%;
-            transform: translateY(-50%);
-            text-align: center;
           }
 
-          .search-value {
+          .el-input-group__append {
-            font-size: 14px;
+            width: 100%;
-            margin-right: 20px;
+            padding: 0;
-          }
 
-          .search-id {
+            .el-select {
-            color: var(--el-color-info);
+              .el-select__wrapper {
-          }
+                background-color: #FFFFFF;
-
+                box-shadow: 0 0 0 1px var(--el-input-border-color, var(--el-border-color)) inset;
-          .search-follow__icon {
+              }
-            position: absolute;
-            top: 50%;
-            right: 10px;
-            transform: translateY(-50%);
-            color: $color-search-follow;
-            margin-right: 10px;
-            text-align: center;
-
-            i {
-              font-size: 12px;
             }
           }
-
-          .search-content {
-            display: flex;
-            flex-direction: column;
-            height: 100%;
-            justify-content: center;
-          }
-
-          .active-icon {
-            background: $color-business;
-          }
-
-          .inactive-icon {
-            background: $color-inactive;
-          }
-
-          .search-select {
-            max-height: 250px;
-          }
-
-          .search-select .el-scrollbar__wrap {
-            max-height: 250px;
-            overflow-y: auto;
-          }
-
-          .el-select-dropdown .el-scrollbar .el-select-dropdown__wrap .el-scrollbar__view.el-select-dropdown__list .el-select-dropdown__item {
-            position: relative;
-            height: 48px;
-            line-height: 16px;
-          }
         }
-      }*/
+      }
       .analysis-statistics__condition {
         display: flex;
         justify-content: space-between;
@@ -549,12 +516,13 @@ $color-highlight: #CC4444;
 
       .analysis-statistics__title {
         position: relative;
-        margin-bottom: 10px;
+        margin-bottom: 8px;
         padding-left: 10px;
         font-size: 16px;
         color: $color-text-primary;
         display: flex;
         justify-content: space-between;
+
         .el-checkbox__label {
           font-size: 14px;
           color: $color-text-primary !important;
@@ -832,6 +800,12 @@ $color-highlight: #CC4444;
                         margin-left: 2px;
                         border-radius: 50%;
                         background-color: $color-circle;
+
+                        &.circle-circle__highlight {
+                          margin-left: 0;
+                          width: 14px;
+                          height: 14px;
+                        }
                       }
 
                       .circle-line {
@@ -879,7 +853,7 @@ $color-highlight: #CC4444;
     box-shadow: 0 1px 10px 0 rgba(0, 0, 0, 0.5);
     border-radius: 2px;
     min-width: 185px;
-    z-index: 1;
+    z-index: 5;
 
     /*&.geo-analysis__hexagon-tooltip--hexagon {
     }*/
@@ -896,7 +870,18 @@ $color-highlight: #CC4444;
 
       .hexagon-tooltip__body {
         .body__item .item__label {
-          width: 140px;
+          width: 80px;
+        }
+      }
+    }
+    &.geo-analysis__hexagon-tooltip--cell {
+      .icon__box {
+        background-color: $color-cell;
+      }
+
+      .hexagon-tooltip__body {
+        .body__item .item__label {
+          width: 100px;
         }
       }
     }

src/assets/css/font/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "cn-icon"; /* Project id 2614877 */
-  src: url('iconfont.woff2?t=1722997039116') format('woff2'),
+  src: url('iconfont.woff2?t=1730282688072') format('woff2'),
-       url('iconfont.woff?t=1722997039116') format('woff'),
+       url('iconfont.woff?t=1730282688072') format('woff'),
-       url('iconfont.ttf?t=1722997039116') format('truetype');
+       url('iconfont.ttf?t=1730282688072') format('truetype');
 }
 
 .cn-icon {
@@ -13,6 +13,22 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.cn-icon-breached-human-black:before {
+  content: "\e824";
+}
+
+.cn-icon-breached-human-white:before {
+  content: "\e822";
+}
+
+.cn-icon-base-station2:before {
+  content: "\e820";
+}
+
+.cn-icon-signal:before {
+  content: "\e823";
+}
+
 .cn-icon-fuhe:before {
   content: "\e815";
 }

src/utils/api.js

@@ -379,7 +379,7 @@ export const api = {
     density: apiVersion + '/locationIntelligence/population/density',
     trend: apiVersion + '/locationIntelligence/active/trend',
     count: apiVersion + '/locationIntelligence/active/count',
-    baseStation: apiVersion + '/locationIntelligence/baseStation',
+    baseStation: apiVersion + '/cell/list',
     list: apiVersion + '/locationIntelligence/list',
     totalCount: apiVersion + '/locationIntelligence/list/count',
     followedSubscriber: apiVersion + '/locationIntelligence/followed/subscribers',