update

src/components/Container/index.vue

@@ -90,7 +90,7 @@ const headerTitleClasses = computed(() => [
 	width: 100%;
 	margin-bottom: 15px;
 	position: relative;
-	margin-bottom: 100px;
+	// margin-bottom: 100px;
 }
 
 .container-header {

src/views/bill/billHome/utils/doublePieChart.js

@@ -6,7 +6,7 @@ const getDoublePieChart = (data1, data2) => {
     series: [
       {
         type: 'pie',
-        radius: [25, 68],
+        radius: [45, 88],
         // height: '100%',
         left: 'center',
         // width: '100%',
@@ -32,10 +32,10 @@ const getDoublePieChart = (data1, data2) => {
       },
       {
         type: 'pie',
-        radius: [70, 100],
+        radius: [90, 120],
         height: '100%',
         left: 'center',
-        width: '80%',
+        width: '98%',
         itemStyle: {
           borderColor: '#fff',
           borderWidth: 1
@@ -45,11 +45,18 @@ const getDoublePieChart = (data1, data2) => {
           formatter: '{name|{b}}\n{time|{c} 条 {d}%}',
           minMargin: 5,
           edgeDistance: 10,
-          lineHeight: 15,
-          rich: {
+          lineHeight: 24,
+           rich: {
+            name: {
+              color: 'rgba(59, 65, 75, 1)',
+              fontFamily: 'Microsoft YaHei',
+              fontSize: 16,
+              fontWeight: 'bold',
+            },
             time: {
-              fontSize: 10,
-              color: '#999'
+              fontSize: 16,
+              fontFamily: 'Microsoft YaHei',
+              color: '#rgba(95, 101, 108, 1)'
             }
           }
         },

src/views/bill/billHome/utils/piechart.js

-const getPieChart = (data,colorList) => {
+const getPieChart = (data, colorList) => {
   let option = {
     // color: colorList,
     series: [
       {
-      type: 'pie',
-      radius: [70, 100],
-      height: '100%',
-      left: 'center',
-      width: '100%',
-      itemStyle: {
-        borderColor: '#fff',
-        borderWidth: 1
-      },
-      label: {
-        alignTo: 'edge',
-        formatter: '{name|{b}}\n{time|{c} 条 {d}%}',
-        minMargin: 5,
-        edgeDistance: 10,
-        lineHeight: 15,
-        rich: {
-          time: {
-            fontSize: 10,
-            color: '#999'
+        type: 'pie',
+        radius: [70, 100],
+        height: '100%',
+        left: 'center',
+        width: '100%',
+        itemStyle: {
+          borderColor: '#fff',
+          borderWidth: 1
+        },
+        label: {
+          alignTo: 'edge',
+          formatter: '{name|{b}}\n{time|{c} 条 {d}%}',
+          minMargin: 5,
+          edgeDistance: 10,
+          lineHeight: 25,
+          rich: {
+            name: {
+              color: 'rgba(59, 65, 75, 1)',
+              fontFamily: 'Microsoft YaHei',
+              fontSize: 16,
+              fontWeight: 'bold',
+            },
+            time: {
+              fontSize: 16,
+              fontFamily: 'Microsoft YaHei',
+              color: '#rgba(95, 101, 108, 1)'
+            }
           }
-        }
-      },
-      labelLine: {
-        length: 15,
-        length2: 0,
-        maxSurfaceAngle: 80
-      },
-      labelLayout: function (params) {
-        const isLeft = params.labelRect.x < 556 / 2;
-        const points = params.labelLinePoints;
-        // Update the end point.
-        points[2][0] = isLeft
-          ? params.labelRect.x
-          : params.labelRect.x + params.labelRect.width;
-        return {
-          labelLinePoints: points
-        };
-      },
-      data: data
-    }]
+
+        },
+        labelLine: {
+          length: 15,
+          length2: 0,
+          maxSurfaceAngle: 80
+        },
+        labelLayout: function (params) {
+          const isLeft = params.labelRect.x < 556 / 2;
+          const points = params.labelLinePoints;
+          // Update the end point.
+          points[2][0] = isLeft
+            ? params.labelRect.x
+            : params.labelRect.x + params.labelRect.width;
+          return {
+            labelLinePoints: points
+          };
+        },
+        data: data
+      }]
   }
   return option
 }

src/views/bill/billLayout/index.vue

@@ -380,7 +380,7 @@ onMounted(() => {
 			display: flex;
 			justify-content: space-between;
 			.layout-main-header-left-box {
-				width: 500px;
+				width: 900px;
 				margin-left: 160px;
 				margin-top: 13px;
 				.left-box-top {

src/views/decree/decreeHome/index.vue

@@ -795,7 +795,7 @@ const newsList = ref([
 ]);
 const handleGetNews = async () => {
 	const params = {
-		moduleId: "0101"
+		moduleId: "0100"
 	};
 	try {
 		const res = await getNews(params);

src/views/newsAnalysis/index.vue

@@ -478,14 +478,18 @@ onMounted(() => {
 	}
 
 	&-news-img {
+		height: 370px;
 		border-top: 1px solid rgba(234, 236, 238, 1);
 		padding: 15px 10px;
 		display: flex;
 		align-items: center;
 		justify-content: center;
 		gap: 20px;
+		overflow: hidden;
+		overflow-y: auto;
 	}
 	.box4 {
+		background: orange;
 		.box4-item {
 			display: flex;
 			gap: 10px;