Skip to content

R
risk-monitor
提交 a4c01eef authored 作者: 张伊明's avatar 张伊明
浏览文件
操作

fix 修改政治献金流向显示bug、修改法案首页新闻资讯间距

上级 3bce28ba
隐藏空白字符变更
内嵌 并排
正在显示 包含 223 行增加 和 159 行删除
src/views/bill/billHome/OverviewCard.vue
浏览文件 @ a4c01eef
......@@ -34,10 +34,10 @@ defineProps({
.overview-card {
height: 450px;
box-sizing: border-box;
border: 1px solid rgba(234, 236, 238, 1);
border: 1px solid var(--border-black-5);
border-radius: 10px;
box-shadow: 0px 0px 20px 0px rgba(25, 69, 130, 0.1);
background: rgba(255, 255, 255, 1);
background: var(--bg-white-100);
overflow: hidden;
.overview-card-header {
......
src/views/bill/billHome/ResourceLibrarySection.vue
浏览文件 @ a4c01eef
......@@ -712,7 +712,7 @@ onMounted(() => {
height: 42px;
line-height: 42px;
padding: 0 20px;
color: rgba(59, 65, 75, 1);
color: var(--text-primary-80-color);
font-family: Microsoft YaHei;
font-size: 20px;
font-weight: 400;
......@@ -726,11 +726,11 @@ onMounted(() => {
.btnActive {
background: var(--color-main-active);
color: #fff;
color: var(--bg-white-100);
font-weight: 700;
&:hover {
color: #fff;
color: var(--bg-white-100);
background: var(--color-main-active);
}
}
......@@ -760,7 +760,7 @@ onMounted(() => {
border: 1px solid rgba(234, 236, 238, 1);
border-radius: 10px;
box-shadow: 0px 0px 20px 0px rgba(25, 69, 130, 0.1);
background: rgba(255, 255, 255, 1);
background: var(--bg-white-100);
.select-box {
margin-top: 20px;
......@@ -780,7 +780,7 @@ onMounted(() => {
.title {
color: var(--color-main-active);
font-family: Microsoft YaHei;
font-size: 16px;
font-size: var(--font-size-base);
font-weight: 700;
line-height: 24px;
letter-spacing: 1px;
......@@ -802,8 +802,8 @@ onMounted(() => {
margin-bottom: 4px;
:deep(.el-checkbox__label) {
color: rgb(95, 101, 108);
font-size: 16px;
color: var(--text-primary-65-color);
font-size: var(--font-size-base);
font-weight: 400;
font-family: "Microsoft YaHei";
line-height: 24px;
......@@ -852,9 +852,9 @@ onMounted(() => {
}
:deep(.el-checkbox__label) {
color: #5f656c;
color: var(--text-primary-65-color);
font-family: "Microsoft YaHei";
font-size: 16px;
font-size: var(--font-size-base);
font-weight: 400;
line-height: 24px;
padding-left: 10px;
......@@ -885,7 +885,7 @@ onMounted(() => {
box-sizing: border-box;
border-radius: 10px;
box-shadow: 0px 0px 20px 0px rgba(25, 69, 130, 0.1);
background: #fff;
background: var(--bg-white-100);
overflow: hidden;
display: flex;
flex-direction: column;
......@@ -931,7 +931,7 @@ onMounted(() => {
box-sizing: border-box;
object-fit: contain;
border-radius: 50%;
background: #fff;
background: var(--bg-white-100);
}
.member-main {
......@@ -949,7 +949,7 @@ onMounted(() => {
}
.member-name {
color: rgb(59, 65, 75);
color: var(--text-primary-80-color);
font-family: "Source Han Sans CN";
font-size: 18px;
font-weight: 700;
......@@ -962,15 +962,15 @@ onMounted(() => {
.member-link {
flex-shrink: 0;
color: #1459bb;
font-size: 16px;
font-size: var(--font-size-base);
line-height: 24px;
}
.member-meta,
.member-committee {
margin-top: 6px;
color: #5f656c;
font-size: 16px;
color: var(--text-primary-65-color);
font-size: var(--font-size-base);
line-height: 24px;
font-weight: 400;
white-space: nowrap;
......@@ -989,8 +989,8 @@ onMounted(() => {
height: 24px;
padding: 5px 8px;
border-radius: 4px;
background: rgb(231, 243, 255);
color: rgb(5, 95, 194);
background: var(--color-primary-10);
color: var(--color-main-active);
font-size: 14px;
font-weight: 400;
line-height: 14px;
......@@ -1004,8 +1004,8 @@ onMounted(() => {
align-items: center;
justify-content: space-between;
border-top: 1px solid #eaeced;
color: #5f656c;
font-size: 16px;
color: var(--text-primary-65-color);
font-size: var(--font-size-base);
cursor: pointer;
&:hover {
......@@ -1022,9 +1022,9 @@ onMounted(() => {
}
.member-arrow {
font-size: 16px;
font-size: var(--font-size-base);
line-height: 1;
color: #5f656c;
color: var(--text-primary-65-color);
}
.member-info {
......@@ -1049,7 +1049,7 @@ onMounted(() => {
box-sizing: border-box;
border-radius: 10px;
box-shadow: 0px 0px 20px 0px rgba(25, 69, 130, 0.1);
background: #fff;
background: var(--bg-white-100);
display: flex;
flex-direction: column;
gap: 12px;
......@@ -1085,9 +1085,9 @@ onMounted(() => {
.coop-member-name {
max-width: 130px;
color: #3b414b;
color: var(--text-primary-80-color);
font-family: "Source Han Sans CN";
font-size: 16px;
font-size: var(--font-size-base);
font-weight: 700;
line-height: 24px;
white-space: nowrap;
......@@ -1104,7 +1104,7 @@ onMounted(() => {
.coop-summary {
flex: 1;
min-width: 0;
color: #5f656c;
color: var(--text-primary-65-color);
font-family: "Microsoft YaHei";
font-size: 14px;
font-weight: 400;
......@@ -1169,7 +1169,7 @@ onMounted(() => {
display: flex;
align-items: center;
gap: 8px;
color: #3b414b;
color: var(--text-primary-80-color);
font-family: "Microsoft YaHei";
font-size: 15px;
font-weight: 700;
......@@ -1183,7 +1183,7 @@ onMounted(() => {
.coop-proposal-subtitle {
margin-top: 2px;
color: #5f656c;
color: var(--text-primary-65-color);
font-family: "Microsoft YaHei";
font-size: 14px;
font-weight: 400;
......@@ -1199,7 +1199,7 @@ onMounted(() => {
top: 50%;
transform: translateY(-50%);
color: #c0c4cc;
font-size: 16px;
font-size: var(--font-size-base);
line-height: 1;
}
}
......@@ -1211,7 +1211,7 @@ onMounted(() => {
padding: 20px 24px;
border-radius: 10px;
box-shadow: 0px 0px 20px 0px rgba(25, 69, 130, 0.1);
background: #fff;
background: var(--bg-white-100);
}
.committee-info {
......@@ -1231,7 +1231,7 @@ onMounted(() => {
}
.committee-name {
color: #3b414b;
color: var(--text-primary-80-color);
font-family: "Microsoft YaHei";
font-size: 20px;
font-weight: 700;
......@@ -1240,9 +1240,9 @@ onMounted(() => {
.committee-desc {
margin-top: 8px;
color: #5f656c;
color: var(--text-primary-65-color);
font-family: "Microsoft YaHei";
font-size: 16px;
font-size: var(--font-size-base);
font-weight: 400;
line-height: 24px;
}
......@@ -1278,7 +1278,7 @@ onMounted(() => {
box-sizing: border-box;
border-radius: 10px;
box-shadow: 0px 0px 20px 0px rgba(25, 69, 130, 0.1);
background: rgba(255, 255, 255, 1);
background: var(--bg-white-100);
margin-bottom: 16px;
overflow: hidden;
display: flex;
......@@ -1313,18 +1313,18 @@ onMounted(() => {
}
.risk-tag-critical {
background: rgba(206, 79, 81, 0.1);
color: rgb(206, 79, 81);
background: var(--color-red-10);
color: var(--color-red-100);
}
.risk-tag-high {
background: rgba(255, 149, 77, 0.1);
color: rgb(255, 149, 77);
background: var(--color-orange-10);
color: var(--color-orange-100);
}
.risk-tag-medium {
background: rgba(232, 189, 11, 0.1);
color: rgb(232, 189, 11);
background: var(--color-yellow-10);
color: var(--color-yellow-100);
}
.bill-cover {
......@@ -1342,7 +1342,7 @@ onMounted(() => {
right: 0;
bottom: 0;
height: 33.333%;
background: linear-gradient(to bottom, rgba(255, 255, 255, 0), rgba(255, 255, 255, 0.92) 60%, rgba(255, 255, 255, 1));
background: linear-gradient(to bottom, rgba(255, 255, 255, 0), rgba(255, 255, 255, 0.92) 60%, var(--bg-white-100));
pointer-events: none;
}
}
......@@ -1365,7 +1365,7 @@ onMounted(() => {
justify-content: center;
padding: 0 12px;
box-sizing: border-box;
color: rgba(59, 65, 75, 1);
color: var(--text-primary-80-color);
font-family: "Source Han Sans CN";
font-size: 20px;
font-weight: 700;
......@@ -1395,7 +1395,7 @@ onMounted(() => {
.title {
cursor: pointer;
height: 26px;
color: rgba(59, 65, 75, 1);
color: var(--text-primary-80-color);
font-family: Microsoft YaHei;
font-size: 20px;
font-weight: 700;
......@@ -1410,9 +1410,9 @@ onMounted(() => {
.en-title {
margin-top: 8px;
height: 24px;
color: rgba(95, 101, 108, 1);
color: var(--text-primary-65-color);
font-family: Microsoft YaHei;
font-size: 16px;
font-size: var(--font-size-base);
font-weight: 400;
line-height: 24px;
letter-spacing: 0px;
......@@ -1434,9 +1434,9 @@ onMounted(() => {
.item-left {
width: 88px;
color: rgb(59, 65, 75);
color: var(--text-primary-80-color);
font-family: "Microsoft YaHei";
font-size: 16px;
font-size: var(--font-size-base);
font-weight: 700;
line-height: 24px;
letter-spacing: 1px;
......@@ -1446,9 +1446,9 @@ onMounted(() => {
.item-right {
max-width: 1000px;
margin-left: 10px;
color: rgba(95, 101, 108, 1);
color: var(--text-primary-65-color);
font-family: "Microsoft YaHei";
font-size: 16px;
font-size: var(--font-size-base);
font-weight: 400;
line-height: 24px;
letter-spacing: 0px;
......@@ -1466,7 +1466,7 @@ onMounted(() => {
line-height: 24px;
padding: 0 8px;
border-radius: 4px;
background: rgba(231, 243, 255, 1);
background: var(--color-primary-10);
color: var(--color-main-active);
font-family: "Microsoft YaHei";
font-size: 14px;
......@@ -1484,8 +1484,8 @@ onMounted(() => {
height: 24px;
line-height: 22px;
padding: 0 10px 0 30px;
background: rgba(255, 255, 255, 1);
color: rgb(95, 101, 108);
background: var(--bg-white-100);
color: var(--text-primary-65-color);
border-top: 1px solid rgb(234, 236, 238);
border-bottom: 1px solid rgb(234, 236, 238);
position: relative;
......@@ -1518,16 +1518,16 @@ onMounted(() => {
}
&:last-child {
background: rgb(59, 65, 75);
color: rgba(255, 255, 255, 1);
border-color: rgb(59, 65, 75);
background: var(--text-primary-80-color);
color: var(--bg-white-100);
border-color: var(--text-primary-80-color);
padding-right: 10px;
border-radius: 0;
border-right: none;
&::after {
display: block;
border-color: rgb(59, 65, 75);
border-color: var(--text-primary-80-color);
box-shadow: none;
}
}
......@@ -1536,9 +1536,9 @@ onMounted(() => {
margin-left: 0;
padding: 0 10px;
border-radius: 4px 0 0 4px;
background: rgb(59, 65, 75);
color: rgba(255, 255, 255, 1);
border: 1px solid rgb(59, 65, 75);
background: var(--text-primary-80-color);
color: var(--bg-white-100);
border: 1px solid var(--text-primary-80-color);
border-right: none;
}
}
......@@ -1556,9 +1556,9 @@ onMounted(() => {
padding-top: 12px;
.footer-left {
color: rgba(59, 65, 75, 1);
color: var(--text-primary-80-color);
font-family: "Microsoft YaHei";
font-size: 16px;
font-size: var(--font-size-base);
font-weight: 400;
line-height: 32px;
}
......
src/views/bill/billHome/index.vue
浏览文件 @ a4c01eef
......@@ -955,7 +955,7 @@ onUnmounted(() => {
.search-header {
width: 100%;
// height: 144px;
background: #fff;
background: var(--bg-white-100);
// overflow: hidden;
box-shadow: 0px 0px 15px 0px rgba(22, 119, 255, 0.1);
......@@ -974,7 +974,7 @@ onUnmounted(() => {
border-radius: 10px;
// box-shadow: 0px 0px 15px 0px rgba(22, 119, 255, 0.1);
border: 1px solid var(--color-primary-35);
background: rgba(255, 255, 255, 1);
background: var(--bg-white-100);
box-sizing: border-box;
padding: 1px;
position: relative;
......@@ -1009,9 +1009,9 @@ onUnmounted(() => {
.search-text {
margin-left: 8px;
height: 22px;
color: #fff;
color: var(--bg-white-100);
font-family: Microsoft YaHei;
font-size: 16px;
font-size: var(--font-size-base);
font-weight: 400;
line-height: 22px;
}
......@@ -1033,7 +1033,7 @@ onUnmounted(() => {
border: 1px solid #aed6ff;
box-sizing: border-box;
border-radius: 24px;
background: #e7f3ff;
background: var(--color-primary-10);
cursor: pointer;
position: relative;
......@@ -1106,7 +1106,7 @@ onUnmounted(() => {
height: 48px;
border-radius: 10px;
box-shadow: 0px 0px 15px 0px rgba(22, 119, 255, 0.1);
background: rgba(255, 255, 255, 0.65);
background: var(--bg-white-65);
box-sizing: border-box;
padding: 1px;
position: relative;
......@@ -1142,9 +1142,9 @@ onUnmounted(() => {
.search-text {
margin-left: 8px;
height: 22px;
color: #fff;
color: var(--bg-white-100);
font-family: Microsoft YaHei;
font-size: 16px;
font-size: var(--font-size-base);
font-weight: 400;
line-height: 22px;
}
......@@ -1176,9 +1176,9 @@ onUnmounted(() => {
.item-footer {
margin-top: 10px;
height: 30px;
color: rgba(95, 101, 108, 1);
color: var(--text-primary-65-color);
font-family: Microsoft YaHei;
font-size: 16px;
font-size: var(--font-size-base);
font-weight: 400;
line-height: 30px;
}
......@@ -1201,7 +1201,7 @@ onUnmounted(() => {
border: 1px solid #aed6ff;
box-sizing: border-box;
border-radius: 24px;
background: #e7f3ff;
background: var(--color-primary-10);
cursor: pointer;
position: relative;
......@@ -1254,7 +1254,7 @@ onUnmounted(() => {
height: 450px;
border-radius: 10px;
box-shadow: 0px 0px 15px 0px rgba(22, 119, 255, 0.1);
background: #fff;
background: var(--bg-white-100);
box-sizing: border-box;
position: relative;
......@@ -1331,7 +1331,7 @@ onUnmounted(() => {
height: 48px;
background: var(--color-main-active);
margin-left: 21px;
color: #fff;
color: var(--bg-white-100);
font-family: Microsoft YaHei;
font-size: 20px;
font-weight: 700;
......@@ -1390,16 +1390,16 @@ onUnmounted(() => {
width: 4px;
height: 4px;
border-radius: 2px;
background: rgba(132, 136, 142, 1);
background: var(--text-primary-50-color);
}
.info1-box-left {
margin-left: 18px;
width: 100px;
height: 30px;
color: rgba(95, 101, 108, 1);
color: var(--text-primary-65-color);
font-family: Microsoft YaHei;
font-size: 16px;
font-size: var(--font-size-base);
font-weight: 400;
line-height: 30px;
}
......@@ -1407,9 +1407,9 @@ onUnmounted(() => {
.info1-box-right {
margin-left: 40px;
height: 30px;
color: rgba(95, 101, 108, 1);
color: var(--text-primary-65-color);
font-family: Microsoft YaHei;
font-size: 16px;
font-size: var(--font-size-base);
font-weight: 400;
line-height: 30px;
}
......@@ -1428,7 +1428,7 @@ onUnmounted(() => {
top: 15px;
left: 4px;
width: 2px;
background: #e6e7e8;
background: var(--bg-black-10);
}
.info2-item {
......@@ -1444,7 +1444,7 @@ onUnmounted(() => {
left: 4px;
top: 18px;
width: 2px;
background: #e6e7e8;
background: var(--bg-black-10);
height: 34px;
}
......@@ -1474,9 +1474,9 @@ onUnmounted(() => {
margin-left: 15px;
width: 147px;
height: 30px;
color: rgba(59, 65, 75, 1);
color: var(--text-primary-80-color);
font-family: Microsoft YaHei;
font-size: 16px;
font-size: var(--font-size-base);
font-weight: 700;
line-height: 30px;
}
......@@ -1485,9 +1485,9 @@ onUnmounted(() => {
margin-left: 10px;
width: 320px;
height: 30px;
color: rgba(59, 65, 75, 1);
color: var(--text-primary-80-color);
font-family: Microsoft YaHei;
font-size: 16px;
font-size: var(--font-size-base);
font-weight: 400;
line-height: 30px;
overflow: hidden;
......@@ -1526,9 +1526,9 @@ onUnmounted(() => {
.inner-box-title {
flex: 9;
color: rgba(255, 255, 255, 1);
color: var(--bg-white-100);
font-family: Microsoft YaHei;
font-size: 16px;
font-size: var(--font-size-base);
font-weight: 700;
line-height: 30px;
overflow: hidden;
......@@ -1539,7 +1539,7 @@ onUnmounted(() => {
.inner-box-time {
flex: 2;
height: 30px;
color: rgba(255, 255, 255, 0.65);
color: var(--bg-white-65);
font-family: Microsoft YaHei;
font-size: 14px;
font-weight: 400;
......@@ -1554,7 +1554,7 @@ onUnmounted(() => {
width: 100%;
height: 40px;
overflow: hidden;
color: rgba(255, 255, 255, 0.8);
color: var(--bg-white-80);
font-family: Microsoft YaHei;
font-size: 14px;
font-weight: 400;
......@@ -1570,7 +1570,7 @@ onUnmounted(() => {
height: 450px;
border-radius: 10px;
box-shadow: 0px 0px 15px 0px rgba(22, 119, 255, 0.1);
background: rgba(255, 255, 255, 1);
background: var(--bg-white-100);
position: relative;
.box2-header {
......@@ -1596,13 +1596,13 @@ onUnmounted(() => {
margin-left: 18px;
width: 148px;
height: 48px;
background: rgba(206, 79, 81, 1);
background: var(--color-red-100);
display: flex;
.text {
margin-left: 16px;
height: 22px;
color: #fff;
color: var(--bg-white-100);
font-family: Microsoft YaHei;
font-size: 20px;
font-weight: 700;
......@@ -1680,9 +1680,9 @@ onUnmounted(() => {
.text {
width: 315px;
color: rgba(59, 65, 75, 1);
color: var(--text-primary-80-color);
font-family: Microsoft YaHei;
font-size: 16px;
font-size: var(--font-size-base);
font-weight: 400;
line-height: 47px;
overflow: hidden;
......@@ -1694,7 +1694,7 @@ onUnmounted(() => {
width: 88px;
margin-left: 5px;
line-height: 47px;
color: rgba(132, 136, 142, 1);
color: var(--text-primary-50-color);
font-family: Microsoft YaHei;
font-size: 14px;
font-weight: 400;
......@@ -1752,13 +1752,14 @@ onUnmounted(() => {
margin-top: 21px;
height: 450px;
display: flex;
gap:16px;
.box3 {
width: 792px;
height: 450px;
border-radius: 10px;
box-shadow: 0px 0px 15px 0px rgba(25, 69, 130, 0.2);
background: rgba(255, 255, 255, 1);
background: var(--bg-white-100);
.box3-header {
height: 48px;
......@@ -1857,9 +1858,9 @@ onUnmounted(() => {
.title {
width: 440px;
height: 24px;
color: rgba(59, 65, 75, 1);
color: var(--text-primary-80-color);
font-family: Microsoft YaHei;
font-size: 16px;
font-size: var(--font-size-base);
font-weight: 700;
line-height: 24px;
overflow: hidden;
......@@ -1871,7 +1872,7 @@ onUnmounted(() => {
flex: 1;
text-align: right;
height: 24px;
color: rgba(95, 101, 108, 1);
color: var(--text-primary-65-color);
font-family: Microsoft YaHei;
font-size: 14px;
font-weight: 400;
......@@ -1883,9 +1884,9 @@ onUnmounted(() => {
.right-footer {
width: 657px;
height: 24px;
color: rgba(59, 65, 75, 1);
color: var(--text-primary-80-color);
font-family: Microsoft YaHei;
font-size: 16px;
font-size: var(--font-size-base);
font-weight: 400;
line-height: 24px;
overflow: hidden;
......@@ -1903,7 +1904,7 @@ onUnmounted(() => {
height: 450px;
border-radius: 10px;
box-shadow: 0px 0px 15px 0px rgba(25, 69, 130, 0.2);
background: rgba(255, 255, 255, 1);
background: var(--bg-white-100);
.box4-header {
width: 792px;
......@@ -2062,9 +2063,9 @@ onUnmounted(() => {
.box8-desc {
height: 24px;
line-height: 24px;
color: rgb(206, 79, 81);
color: var(--color-red-100);
font-family: Microsoft YaHei;
font-size: 16px;
font-size: var(--font-size-base);
font-weight: 700;
}
......@@ -2115,7 +2116,7 @@ onUnmounted(() => {
height: 42px;
line-height: 42px;
padding: 0 20px;
color: rgba(59, 65, 75, 1);
color: var(--text-primary-80-color);
font-family: Microsoft YaHei;
font-size: 20px;
font-weight: 400;
......@@ -2131,11 +2132,11 @@ onUnmounted(() => {
.btnActive {
background: var(--color-main-active);
color: #fff;
color: var(--bg-white-100);
font-weight: 700;
&:hover {
color: #fff;
color: var(--bg-white-100);
background: var(--color-main-active);
}
}
......@@ -2173,7 +2174,7 @@ onUnmounted(() => {
border: 1px solid rgba(234, 236, 238, 1);
border-radius: 10px;
box-shadow: 0px 0px 20px 0px rgba(25, 69, 130, 0.1);
background: rgba(255, 255, 255, 1);
background: var(--bg-white-100);
.select-box {
margin-top: 20px;
......@@ -2216,8 +2217,8 @@ onUnmounted(() => {
margin-bottom: 4px;
:deep(.el-checkbox__label) {
color: rgb(95, 101, 108);
font-size: 16px;
color: var(--text-primary-65-color);
font-size: var(--font-size-base);
font-weight: 400;
font-family: "Microsoft YaHei";
line-height: 24px;
......@@ -2252,7 +2253,7 @@ onUnmounted(() => {
padding-bottom: 24px;
border-radius: 10px;
box-shadow: 0px 0px 20px 0px rgba(25, 69, 130, 0.1);
background: rgba(255, 255, 255, 1);
background: var(--bg-white-100);
margin-bottom: 16px;
overflow: hidden;
......@@ -2268,7 +2269,7 @@ onUnmounted(() => {
.title {
cursor: pointer;
height: 26px;
color: rgba(59, 65, 75, 1);
color: var(--text-primary-80-color);
font-family: Microsoft YaHei;
font-size: 20px;
font-weight: 700;
......@@ -2283,9 +2284,9 @@ onUnmounted(() => {
.en-title {
margin-top: 8px;
height: 24px;
color: rgba(95, 101, 108, 1);
color: var(--text-primary-65-color);
font-family: Microsoft YaHei;
font-size: 16px;
font-size: var(--font-size-base);
font-weight: 400;
line-height: 24px;
letter-spacing: 0px;
......@@ -2309,9 +2310,9 @@ onUnmounted(() => {
.item-left {
width: 100px;
// height: 24px;
color: rgb(59, 65, 75);
color: var(--text-primary-80-color);
font-family: "Microsoft YaHei";
font-size: 16px;
font-size: var(--font-size-base);
font-weight: 700;
line-height: 24px;
letter-spacing: 1px;
......@@ -2321,9 +2322,9 @@ onUnmounted(() => {
.item-right {
max-width: 1000px;
margin-left: 10px;
color: rgba(95, 101, 108, 1);
color: var(--text-primary-65-color);
font-family: "Microsoft YaHei";
font-size: 16px;
font-size: var(--font-size-base);
font-weight: 400;
line-height: 24px;
letter-spacing: 0px;
......@@ -2340,7 +2341,7 @@ onUnmounted(() => {
line-height: 24px;
padding: 0 8px;
border-radius: 4px;
background: rgba(231, 243, 255, 1);
background: var(--color-primary-10);
color: var(--color-main-active);
font-family: "Microsoft YaHei";
font-size: 14px;
......@@ -2357,8 +2358,8 @@ onUnmounted(() => {
height: 24px;
line-height: 22px;
padding: 0 10px 0 30px;
background: rgba(255, 255, 255, 1);
color: rgb(95, 101, 108);
background: var(--bg-white-100);
color: var(--text-primary-65-color);
border-top: 1px solid rgb(234, 236, 238);
border-bottom: 1px solid rgb(234, 236, 238);
position: relative;
......@@ -2391,16 +2392,16 @@ onUnmounted(() => {
}
&:last-child {
background: rgb(59, 65, 75);
background: var(--text-primary-80-color);
color: rgba(255, 255, 255, 1);
border-color: rgb(59, 65, 75);
border-color: var(--text-primary-80-color);
padding-right: 10px;
border-radius: 0;
border-right: none;
&::after {
display: block;
border-color: rgb(59, 65, 75);
border-color: var(--text-primary-80-color);
box-shadow: none;
}
}
......@@ -2409,9 +2410,9 @@ onUnmounted(() => {
margin-left: 0;
padding: 0 10px;
border-radius: 4px 0 0 4px;
background: rgb(59, 65, 75);
background: var(--text-primary-80-color);
color: rgba(255, 255, 255, 1);
border: 1px solid rgb(59, 65, 75);
border: 1px solid var(--text-primary-80-color);
border-right: none;
}
}
......@@ -2429,9 +2430,9 @@ onUnmounted(() => {
padding-top: 12px;
.footer-left {
color: rgba(59, 65, 75, 1);
color: var(--text-primary-80-color);
font-family: "Microsoft YaHei";
font-size: 16px;
font-size: var(--font-size-base);
font-weight: 400;
line-height: 32px;
}
......@@ -2448,9 +2449,9 @@ onUnmounted(() => {
justify-content: space-between;
.footer-left {
color: rgba(59, 65, 75, 1);
color: var(--text-primary-80-color);
font-family: "Microsoft YaHei";
font-size: 16px;
font-size: var(--font-size-base);
font-weight: 400;
line-height: 32px;
}
......
src/views/bill/deepDig/poliContribution/index.vue
浏览文件 @ a4c01eef
......@@ -246,7 +246,7 @@
</template>
<script setup>
import { ref, onMounted, watch, computed } from "vue";
import { ref, onMounted, watch, computed, nextTick } from "vue";
import { getBillPoliContribution, getBillMainPoliContribution, getBillPersonPoliContribution } from "@/api/deepdig";
import setChart from "@/utils/setChart";
......@@ -617,7 +617,7 @@ const getMainPoliContribution = async () => {
const fullSourceList = ref([]);
const showAllSankeyData = ref(false);
const renderSankeyChart = () => {
const renderSankeyChart = async () => {
const sourceList = showAllSankeyData.value ? fullSourceList.value : fullSourceList.value.slice(0, 5);
if (sourceList.length > 0) {
......@@ -626,33 +626,39 @@ const renderSankeyChart = () => {
const totalAmount = sourceList.reduce((sum, item) => sum + (item.amount || 0), 0);
const orgNodes = sourceList.map((item, index) => ({
name: item.orgNameZh || item.orgName || `机构${index + 1}`,
value: item.amount,
itemStyle: {
color: sankeyColors[index % sankeyColors.length]
}
}));
const nodes = [
...orgNodes,
{
name: personName,
value: totalAmount,
label: { position: "left" },
itemStyle: {
color: "#FF1493"
}
},
...sourceList.map((item, index) => ({
name: item.orgNameZh,
value: item.amount,
itemStyle: {
color: sankeyColors[index % sankeyColors.length]
color: "#34C38F"
}
}))
}
];
const links = sourceList.map(item => ({
source: item.orgNameZhZh,
target: personName,
value: item.amount
}));
const links = sourceList
.map((item, index) => ({
source: item.orgNameZh || item.orgName || `机构${index + 1}`,
target: personName,
value: item.amount
}))
.filter(item => !!item.source && !!item.target);
// `chart1` 容器由 v-if/v-else 动态渲染，必须等 DOM 挂载后再 init
await nextTick();
let chart1 = getSankeyChart(nodes, links);
setChart(chart1, "chart1");
} else {
await nextTick();
let chart1 = getSankeyChart([], []);
setChart(chart1, "chart1");
}
......
src/views/bill/deepDig/poliContribution/utils/sankey.js
浏览文件 @ a4c01eef
......@@ -8,30 +8,87 @@ const getSankeyChart = (data = [], links = []) => {
},
series: {
type: 'sankey',
layout: 'none',
left: '1%',
right: '1%',
top: '5%',
bottom: '5%',
// 禁止鼠标拖拽/缩放平移，避免图表被交互改变
draggable: false,
roam: false,
left: 16,
right: 16,
top: 14,
bottom: 14,
nodeAlign: 'right', // 目标效果：人名贴右侧
emphasis: {
focus: 'adjacency'
},
nodeWidth: 50,
nodeGap: 2,
// 所有色块宽度增加三倍
nodeWidth: 54,
nodeGap: 10,
layoutIterations: 32,
lineStyle: {
color: 'source',
curveness: 0.5
color: 'rgba(0, 0, 0, 0.08)', // 浅灰“行背景带”的基色
opacity: 1,
curveness: 0.2
},
label: {
show: true,
formatter: function (params) {
return `${params.name} $${params.value.toLocaleString()}`;
return `${params.name}`;
},
position: 'right',
fontSize: 16,
color: '#555'
color: '#303133',
overflow: 'truncate',
width: 140
},
edgeLabel: {
show: true,
formatter: function (params) {
const val = params.value || 0;
return `$${Number(val).toLocaleString()}`;
},
color: '#303133',
fontSize: 16,
overflow: 'truncate',
width: 140,
align: 'center'
},
itemStyle: {
borderWidth: 0
},
nodeSort: 'descending',
levels: [
// depth = 0（机构节点）
{
depth: 0,
itemStyle: {
borderWidth: 0
},
label: {
position: 'right',
color: '#303133',
fontSize: 16,
overflow: 'truncate',
width: 140
}
},
// depth = 1（人物节点）
{
depth: 1,
itemStyle: {
color: '#34C38F'
},
label: {
// 人物名称移至色块左侧
position: 'left',
// 让文字最右侧紧贴绿色色块左侧
distance: 5,
color: '#303133',
fontSize: 16,
overflow: 'truncate',
width: 120,
align: 'right'
}
}
],
data: data,
links: links
}
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论