feat:merge dev

package.json

@@ -30,8 +30,8 @@
     "echarts": "^5.5.1",
     "element-plus": "^2.8.1",
     "exceljs": "^4.4.0",
-    "highlight.js": "^11.11.1",
     "github-markdown-css": "^5.8.1",
+    "highlight.js": "^11.11.1",
     "leaflet": "^1.9.4",
     "lodash": "^4.17.21",
     "markdown-it": "^14.1.0",

src/components/AIRobot/src/AIRobot.vue

@@ -197,12 +197,7 @@ defineExpose({
                 class="dialogue_content_item"
                 v-for="item in group"
                 :key="item.label"
-<<<<<<< HEAD
-                @click="handelClick(item.label)"
-                :class="{ 'long_item': item.isLong }"
-=======
                 :class="{ long_item: item.isLong }"
->>>>>>> dev
               >
                 {{ item.label }}
               </div>
@@ -215,35 +210,18 @@ defineExpose({
   <div class="AIRobot-top" v-if="isShowAIRobotTop">
     <div class="flex_end" @click="HideAIRobotTopTwo">
       <div class="icon flex_center">
-<<<<<<< HEAD
         <span class="iconfont_icon icon_dark AI_icon">
             <svg class="iconfont" aria-hidden="true">
               <use xlink:href="#icon-icon_reject_b"></use>
             </svg>
           </span>
-=======
-        <span class="iconfont_icon icon_dark">
-          <svg class="iconfont" aria-hidden="true">
-            <use xlink:href="#icon-icon_reject_b"></use>
-          </svg>
-        </span>
->>>>>>> dev
       </div>
     </div>
     <div class="dialogue_title">Hi! I'm your Freight Assistant, always on call</div>
   </div>
   <!-- 悬浮icon -->
-<<<<<<< HEAD
-  <div class="AIRobot flex_center" v-if="AIIconVisible">
-    <el-popover
-      :visible="visible"
-      placement="top-end"
-      width="auto"
-    >
-=======
   <div class="AIRobot flex_center">
     <el-popover :visible="visible" placement="top-end" width="auto">
->>>>>>> dev
       <template #reference>
         <el-avatar
           @click="AvatarClick"