Merge branch 'master' into yp-dev

src/views/characterPage/components/techLeader/components/characterRelationships/index.vue

@@ -21,19 +21,19 @@
 <script setup>
 import { ref, onMounted, onBeforeUnmount, watch } from "vue";
 import * as echarts from "echarts";
-import Center from "./assets/埃隆·马斯克.png";
-import P1 from "./assets/唐纳德·特朗普.png";
-import P2 from "./assets/詹姆斯・默多克.png";
-import P3 from "./assets/格温・肖特韦尔.png";
-import P4 from "./assets/金博尔・马斯克.png";
-import P5 from "./assets/拉里・埃里森.png";
-import P6 from "./assets/斯科特·贝森特.png";
-import P7 from "./assets/杰弗里·凯斯勒.png";
-import P8 from "./assets/马尔科·卢比奥.png";
-import P9 from "./assets/道格·伯格姆.png";
-import P10 from "./assets/艾拉・埃伦普里斯.png";
-import P11 from "./assets/贾斯汀・马斯克.png";
-import PS from "./assets/史蒂夫・尤尔韦松.png";
+import Center from "./assets/img1.png";
+import P1 from "./assets/img2.png";
+import P2 from "./assets/img3.png";
+import P3 from "./assets/img4.png";
+import P4 from "./assets/img5.png";
+import P5 from "./assets/img6.png";
+import P6 from "./assets/img7.png";
+import P7 from "./assets/img8.png";
+import P8 from "./assets/img9.png";
+import P9 from "./assets/img10.png";
+import P10 from "./assets/img11.png";
+import P11 from "./assets/img12.png";
+import PS from "./assets/img13.png";
 
 const list = ref(["圆形布局", "力导向布局", "树形布局"]);
 const activeIndex = ref("圆形布局");

src/views/decree/decreeHome/utils/barChart.js

@@ -42,7 +42,7 @@ const getBarChart = (nameList, valueList) => {
       label: {
         show: true,
         position: 'top',
-        color: 'var(--color-main-active)',
+        color: 'rgba(5, 95, 194, 1)',
         fontWeight: 'bold',  // 文字加粗
         fontSize: 14,
         formatter: function (params) {
@@ -59,7 +59,7 @@ const getBarChart = (nameList, valueList) => {
             },
             {
               offset: 1,
-              color: 'var(--color-main-active)'
+              color: 'rgba(5, 95, 194, 1)'
             }
             ]);
         },

src/views/finance/index.vue

@@ -1344,17 +1344,6 @@ const chart1Data = ref({
 	]
 });
 
-// 获取热门法案
-const handleGetHotBills = async () => {
-	try {
-		const res = await getHotBills();
-		console.log("热门法案", res);
-		billList.value = res.data;
-	} catch (error) {
-		console.error(error);
-	}
-};
-
 // 根据法案类型获取法案列表
 const handleGetBillsByType = async () => {
 	const params = {
@@ -1376,7 +1365,6 @@ const handleGetBillsByType = async () => {
 
 onMounted(async () => {
 	handleGetHylyList();
-	await handleGetHotBills();
 	curBill.value = billList.value[0];
 	handleGetBillsByType();
 	let chart1 = getMultiLineChart(chart1Data.value.title, chart1Data.value.data[0].value, chart1Data.value.data[1].value);