Merge remote-tracking branch 'origin/mergeBranch' into mergeBranch

src/components/mindmap/saler.vue

@@ -621,7 +621,7 @@ export default {
 </script>
 <style>
 #container{
-   width: 100vw;
+  width: 100vw;
   height:100vh;
   position: relative;
 }

src/views/mediaStatistics/modules/salesfunnel.vue

@@ -54,13 +54,25 @@ export default {
         data: [],
         width:500,
         xField: 'stagename',
-        yField: 'projectqty',
+        yField: 'sequence1',
         legend: false,
-        // label: {
-        //   formatter: (datum) => {
-        //     return `${(datum[Funnel.PERCENT_FIELD] * 100).toFixed(2)}%`;
-        //   },
-        // },
+        label: {
+          formatter: (datum) => {
+            return `${datum.stagename}:${datum.projectqty}`;
+          },
+        },
+        tooltip:{
+          customContent: (title, items) => {
+            // 构建自定义内容
+            const content = `<div>
+              <ul style="padding:20px">
+                ${items.map((item) => `<li>${title}: ${item.data.projectqty}</li>`).join('')}
+              </ul>
+            </div>`;
+
+            return content;
+          },
+        },
         conversionTag: {
           formatter: (datum) => {
             return `${((datum[Funnel.CONVERSATION_FIELD][1] / datum[Funnel.CONVERSATION_FIELD][0]) * 100).toFixed(2)}%`;