Merge branch 'main' of http://123.132.248.154:10000/HC_YFZX/CaiYuanYiTiHua

src/views/sys/exception/Converge.vue

@@ -42,7 +42,7 @@
     <div class="legend">
       <div v-if="subject == '非法采矿'" class="button-item router-button" style="position: absolute;top: -50px;width: 200px;left: 0px;background-size: 100% 100%;height: 37px;
     font-size: 16px;cursor: pointer" @click="goRouter">汇总表</div>
-      <div class="legend-item" v-for="(item, index) in legends" :key="index">
+      <div :class="`legend-item ${subject == '耕地非粮化'? 'flh-item': ''}`" v-for="(item, index) in legends" :key="index">
         <div class="legend-dot" :style="{ background: item.color }"></div>
         <div class="legend-label">{{ item.label }}</div>
       </div>
@@ -635,6 +635,9 @@ watchEffect(() => {
         margin-left: 12px;
       }
     }
+    .flh-item{
+      width: 120px;
+    }
   }
 
   /**图层控制 视频监控**/

src/views/sys/exception/Converge/SearchComponent.vue

@@ -301,6 +301,9 @@
         padding: 0px 2px;
         font-size: 14px;
         position: relative;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
         &::after {
           content: '';
           width: 2px;