Merge branch 'master' of http://172.16.20.1:3000/duanhao/SocialNetworks_duan

src/store/groupEvolution/index.js

@@ -607,78 +607,31 @@ export const useGroupMemberStore = defineStore("groupMember", {
       }
     ],
     chartData: {
-      xAxisData: ["07:57:46", "09:30:14", "09:57:32", "10:04:47", "10:12:57"],
+        xAxisData: ["07:57:46", "09:30:14", "09:57:32", "10:04:47", "10:12:57"],
-      yAxisRange: { min: 0, max: 25, interval: 5 },
+        yAxisRange: { min: 0, max: 25, interval: 5},
-      seriesList: [
+        seriesList: [
-        {
+          {
-          name: "分裂指数",
+            data: [0.9237, 0.14507, 0, 0, 0],
-          type: "line",
+            name: "分裂指数",
-          lineStyle: {
+            themeColor: "#2AB8FD"
-            color: "#2AB8FD",
-            width: 1 // 设置线条宽度为3像素
           },
-          itemStyle: {
+          {
-            color: "#0A1A2F",
+            data: [9.8011, 21.3123, 10.4338, 14.1912, 10.1523],
-            borderColor: "#2AB8FD",
+            name: "合并指数",
-            borderWidth: 1
+            themeColor: "#02D7DA"
           },
-          symbol: "circle",
+          {
-          symbolSize: 10, // 圆点大小
+            data: [1.9057, 1.5123, 1.0338, 0.5912, 0.1523],
-          data: [0.9237, 0.14507, 0, 0, 0]
+            name: "收缩指数",
-        },
+            themeColor: "#FFDA09"
-        {
-          name: "合并指数",
-          type: "line",
-          lineStyle: {
-            color: "#02D7DA",
-            width: 1 // 设置线条宽度为3像素
           },
-          itemStyle: {
+          {
-            color: "#0A1A2F",
+            data: [15.1119, 6.5123, 10.6338, 9.5912, 4.1523],
-            borderColor: "#01D7DA",
+            name: "扩展指数",
-            borderWidth: 1
+            themeColor: "#EB57B0"
-          },
+          }
-          symbol: "circle",
+        ]
-          symbolSize: 10, // 圆点大小
+      },
-          borderWidth: 1, // 边框宽度
-          data: [9.8011, 21.3123, 10.4338, 14.1912, 10.1523]
-        },
-        {
-          name: "收缩指数",
-          type: "line",
-          lineStyle: {
-            color: "#FFDA09",
-            width: 1 // 设置线条宽度为3像素
-          },
-          itemStyle: {
-            color: "#0A1A2F",
-            borderColor: "#FFDA09",
-            borderWidth: 1
-          },
-          symbol: "circle",
-          symbolSize: 10, // 圆点大小
-          borderWidth: 1, // 边框宽度
-          data: [1.9057, 1.5123, 1.0338, 0.5912, 0.1523]
-        },
-        {
-          name: "扩展指数",
-          type: "line",
-          lineStyle: {
-            color: "#EB57B0",
-            width: 1 // 设置线条宽度为3像素
-          },
-          itemStyle: {
-            color: "#0A1A2F",
-            borderColor: "#EB57B0",
-            borderWidth: 1
-          },
-          symbol: "circle",
-          symbolSize: 10, // 圆点大小
-          borderWidth: 1, // 边框宽度
-          data: [15.1119, 6.5123, 10.6338, 9.5912, 4.1523]
-        }
-      ]
-    },
     chartsData: {
       topSelfMedia: [
         {

src/views/GroupEvolution/component/groupChart.vue

@@ -130,11 +130,19 @@ const initChart = () => {
       borderWidth: 0,
       extraCssText: "box-shadow:none;padding:0;",
       formatter: function (params) {
-        const color = {
+        let color = {
           群体一: "#33b6fb",
           群体二: "#00d6da",
           群体三: "#fddc33"
         }
+        if(props.moduleName == "群体成员演化分析"){
+          color = {
+            分裂指数: "#2AB8FD",
+            合并指数: "#02D7DA",
+            收缩指数: "#FFDA09",
+            扩展指数: "#EB57B0"
+          }
+        }
         const listHtml = params
           .map(
             (item) => `
@@ -257,6 +265,9 @@ watch(
 )
 
 onMounted(() => {
+  console.log("111");
+  
+  console.log(props.moduleName)
   // 获取容器宽度
   sliderContainerWidth.value = document.querySelector(".slider-container").offsetWidth
 })

src/views/GroupEvolution/groupMember/index.vue

@@ -16,7 +16,7 @@
         <div class="userChart">
           <GroupChart
             :title="userChartTitleImg"
-            :moduleName="全局群体成员演化图"
+            :moduleName="moduleName"
             :chartData="groupMemberStore.chartData"
           ></GroupChart>
         </div>