Skip to content

R
risk-monitor
提交 c66ddb8f authored 作者: 闫鹏's avatar 闫鹏
浏览文件
操作

合并分支 'yp-dev' 到 'master'

Yp dev 查看合并请求 !150
上级 748add3b 1dc720e0
隐藏空白字符变更
内嵌 并排
正在显示 包含 101 行增加 和 98 行删除
src/views/ZMOverView/components/fourSuppress/components/allUnion/index.vue
浏览文件 @ c66ddb8f
...@@ -972,7 +972,7 @@ const initRightDonut = async () => { ...@@ -972,7 +972,7 @@ const initRightDonut = async () => {
}, },
label: { label: {
show: true, show: true,
position: "outside", // position: "outside",
fontWeight: "bold", fontWeight: "bold",
fontSize: 14, fontSize: 14,
color: "#333", color: "#333",
...@@ -987,7 +987,7 @@ const initRightDonut = async () => { ...@@ -987,7 +987,7 @@ const initRightDonut = async () => {
symbolSize: res.data[i].amount * 9, symbolSize: res.data[i].amount * 9,
label: { label: {
show: true, show: true,
position: "outside", // position: "outside",
fontWeight: "bold", fontWeight: "bold",
fontSize: 14, fontSize: 14,
color: "#333", color: "#333",
...@@ -1068,8 +1068,8 @@ const initRightDonut = async () => { ...@@ -1068,8 +1068,8 @@ const initRightDonut = async () => {
symbolSize: 80, symbolSize: 80,
roam: true, roam: true,
label: { label: {
show: true, show: true
position: "outside" // position: "outside"
}, },
edgeSymbol: ["circle", ""], edgeSymbol: ["circle", ""],
edgeSymbolSize: [4, 80], edgeSymbolSize: [4, 80],
......
src/views/exportControl/index.vue
浏览文件 @ c66ddb8f
...@@ -943,17 +943,20 @@ onMounted(async () => { ...@@ -943,17 +943,20 @@ onMounted(async () => {
return { name: entityNameZh, enName: entityName }; return { name: entityNameZh, enName: entityName };
}); });
entitiesDataInfoList.value = entitiesDataInfo || []; entitiesDataInfoList.value = entitiesDataInfo || [];
const list = _.chain(industryCountByYear).filter("year").orderBy("year", "desc").value(); const list = _.chain(industryCountByYear).filter("year").orderBy("year", "desc").value().slice(0, 5);
const cclList1 = _.chain(cclList).filter("year").orderBy("year", "desc").value(); const cclList1 = _.chain(cclList).filter("year").orderBy("year", "desc").value();
const total = _.sumBy(list, "count"); const total = _.sumBy(list, "count");
tableData1.value = _.map(list, item => { console.log("shuju list", list);
return { console.log("shuju total", total);
year: item.year, (console.log("shuju industryCountByYear", industryCountByYear),
num: item.count, (tableData1.value = _.map(list, item => {
percent: item.count / total, return {
tags: item.domain year: item.year,
}; num: item.count,
}).slice(0, 5); percent: item.count / total,
tags: item.domain
};
}).slice(0, 5)));
tableData2.value = _.map(cclList1, item => { tableData2.value = _.map(cclList1, item => {
return { return {
year: item.year, year: item.year,
...@@ -2132,94 +2135,94 @@ const handleMediaClick = item => { ...@@ -2132,94 +2135,94 @@ const handleMediaClick = item => {
} }
} }
// .box4 { .box4 {
// height: 786px; height: 786px;
// overflow: auto; overflow: auto;
// display: flex; display: flex;
// flex-direction: column; flex-direction: column;
// justify-content: space-between; justify-content: space-between;
// padding-top: 16px; padding-top: 16px;
// // padding-bottom: 50px; // padding-bottom: 50px;
// position: relative; position: relative;
// .box4-item {
// display: flex;
// gap: 10px;
// align-items: flex-start;
// padding-bottom: 35px;
// position: relative;
// .box4-item-left {
// display: flex;
// flex-direction: column;
// align-items: center;
// .box4-item-left-icon {
// width: 10px;
// height: 10px;
// }
// .box4-item-left-line { .box4-item {
// width: 1px; display: flex;
// height: 100%; gap: 10px;
// position: absolute; align-items: flex-start;
// border-left: 1px solid rgba(10, 87, 166, 0.3); padding-bottom: 35px;
// } position: relative;
// }
// .box4-item-right { .box4-item-left {
// display: flex; display: flex;
// flex-direction: column; flex-direction: column;
align-items: center;
// .box4-item-right-header {
// display: flex;
// justify-content: space-between;
// align-items: center;
// border-bottom: 1px solid rgba(234, 236, 238, 1);
// position: relative;
// top: -7.5px;
// padding-bottom: 8px;
// cursor: pointer;
// &-title {
// font-size: 18px;
// color: $base-color;
// font-weight: 700;
// }
// &-desc {
// font-size: 16px;
// font-weight: 700;
// color: rgba(59, 65, 75, 1);
// }
// }
// .box4-item-right-content { .box4-item-left-icon {
// font-size: 16px; width: 10px;
// font-weight: 400; height: 10px;
// color: rgba(95, 101, 108, 1); }
// overflow: hidden;
// display: -webkit-box;
// -webkit-line-clamp: 3;
// -webkit-box-orient: vertical;
// text-overflow: ellipsis;
// line-height: 25px;
// }
// }
// }
// .box4-footer { .box4-item-left-line {
// position: absolute; width: 1px;
// // margin-top: auto; height: 100%;
// display: flex; position: absolute;
// justify-content: center; border-left: 1px solid rgba(10, 87, 166, 0.3);
// align-items: center; }
// bottom: 30px; }
// left: 50%;
// margin-left: -30px; .box4-item-right {
// // margin-bottom: 30px; display: flex;
// } flex-direction: column;
// }
.box4-item-right-header {
display: flex;
justify-content: space-between;
align-items: center;
border-bottom: 1px solid rgba(234, 236, 238, 1);
position: relative;
top: -7.5px;
padding-bottom: 8px;
cursor: pointer;
&-title {
font-size: 18px;
color: $base-color;
font-weight: 700;
}
&-desc {
font-size: 16px;
font-weight: 700;
color: rgba(59, 65, 75, 1);
}
}
.box4-item-right-content {
font-size: 16px;
font-weight: 400;
color: rgba(95, 101, 108, 1);
overflow: hidden;
display: -webkit-box;
-webkit-line-clamp: 3;
-webkit-box-orient: vertical;
text-overflow: ellipsis;
line-height: 25px;
}
}
}
.box4-footer {
position: absolute;
// margin-top: auto;
display: flex;
justify-content: center;
align-items: center;
bottom: 30px;
left: 50%;
margin-left: -30px;
// margin-bottom: 30px;
}
}
.box5 { .box5 {
height: 115%; height: 115%;
......
src/views/thinkTank/index.vue
浏览文件 @ c66ddb8f
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
{{ "No." + (index + 1) }} {{ "No." + (index + 1) }}
</div> --> </div> -->
<div class="rank"> <div class="rank">
{{ item.reportNumber }} {{ item.reportNumber + "篇报告" }}
</div> </div>
</div> </div>
<div class="card-title"> <div class="card-title">
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论