Skip to content

R
risk-monitor
提交 81d616e5 authored 作者: coderBryanFu's avatar coderBryanFu
浏览文件
操作

update

上级 664303a2
显示空白字符变更
内嵌 并排
正在显示 包含 49 行增加 和 51 行删除
src/views/ZMOverView/components/fourSuppress/components/allGovernment/index.vue
浏览文件 @ 81d616e5
......@@ -1818,7 +1818,7 @@ const prev = () => {
display: flex;
align-items: center;
gap: 8px;
overflow-x: auto;
// overflow-x: auto;
// 启用滚动条
&::-webkit-scrollbar {
......
src/views/bill/deepDig/processAnalysis/index.vue
浏览文件 @ 81d616e5
......@@ -1201,7 +1201,7 @@ onMounted(async () => {
height: 682px;
overflow: auto;
.box3-main-center-content-box {
width: 805px;
width: 746px;
height: 160px;
box-sizing: border-box;
border: 1px solid rgba(243, 243, 244, 1);
......@@ -1213,7 +1213,7 @@ onMounted(async () => {
display: flex;
height: 45px;
.item-box1 {
width: 370px;
width: 340px;
display: flex;
.box1-left {
width: 130px;
......@@ -1252,7 +1252,7 @@ onMounted(async () => {
.box1-right {
// border-left: 1px solid rgba(243, 243, 244, 1);
// border-right: 1px solid rgba(243, 243, 244, 1);
width: 240px;
width: 215px;
.box1-right-top {
:deep(.el-progress-bar__inner) {
background: rgba(22, 119, 255, 1);
......@@ -1299,7 +1299,7 @@ onMounted(async () => {
}
}
.item-box3 {
width: 75px;
width: 65px;
text-align: center;
.box3-1 {
height: 14px;
......@@ -1438,7 +1438,7 @@ onMounted(async () => {
:deep(.el-progress-bar__outer) {
height: 8px !important;
margin-bottom: 8px;
width: 230px;
width: 200px;
margin-left: 10px;
}
</style>
src/views/bill/template/index.vue
浏览文件 @ 81d616e5
......@@ -36,30 +36,14 @@
<div class="left-main-item" v-for="(term, index) in mainTermsList" :key="index">
<div class="id">{{ (currentPage - 1) * pageSize + index + 1 }}</div>
<div class="info">
<el-tooltip
effect="dark"
:content="`第${term.tkxh}条. ${term.fynr}`"
popper-class="bill-template-popper"
placement="top"
:show-after="500"
>
<div class="title">
<span class="title-active">第{{ term.tkxh }}条.</span>
{{ term.fynr }}
</div>
</el-tooltip>
<el-tooltip
effect="dark"
:content="`Sec.${term.tkxh} ${term.ywnr}`"
popper-class="bill-template-popper"
placement="top"
:show-after="500"
>
<div class="content">
<span class="content-active">Sec.{{ term.tkxh }}</span>
{{ term.ywnr }}
</div>
</el-tooltip>
</div>
<div class="tags-box">
<div
......@@ -67,12 +51,12 @@
v-for="(val, idx) in (term.hylyList || []).slice(0, 2)"
:key="idx"
:class="{
'tag1': val === '人工智能',
'tag2': val === '新一代信息技术' || !['人工智能', '政治', '经济', '军事', '科技'].includes(val),
'tag3': val === '政治',
'tag4': val === '经济',
'tag5': val === '军事',
'tag6': val === '科技'
tag1: val === '人工智能',
tag2: val === '新一代信息技术' || !['人工智能', '政治', '经济', '军事', '科技'].includes(val),
tag3: val === '政治',
tag4: val === '经济',
tag5: val === '军事',
tag6: val === '科技'
}"
>
{{ val }}
......@@ -261,7 +245,9 @@ const handleGetBillContentTk = async cRelated => {
mainTermsList.value = (res.data.content || []).map(item => {
// 处理 fynr
if (item.fynr) {
const matchComplex = item.fynr.match(/^(?:正文内容[:：]\s*)?[“"]?\s*第\s*([0-9a-zA-Z]+)\s*[条节][:：\.\。]?[”"]?\s*/);
const matchComplex = item.fynr.match(
/^(?:正文内容[:：]\s*)?[“"]?\s*第\s*([0-9a-zA-Z]+)\s*[条节][:：\.\。]?[”"]?\s*/
);
if (matchComplex) {
// 匹配 "第xxx条"、"正文内容：第xxx条"、"“第xxx条" 等
if (!item.tkxh) {
......@@ -439,15 +425,20 @@ onMounted(async () => {
}
}
.left-main {
height: 660px;
overflow: hidden;
overflow-y: auto;
.left-main-item {
margin-left: 22px;
width: 1016px;
height: 65px;
// height: 65px;
box-sizing: border-box;
border-radius: 2px;
background: rgba(255, 255, 255, 1);
display: flex;
position: relative;
.id {
margin-top: 20px;
margin-left: 15px;
......@@ -463,34 +454,34 @@ onMounted(async () => {
.info {
margin-left: 13px;
margin-top: 15px;
width: 780px;
width: 920px;
.title {
height: 14px;
// height: 14px;
color: rgba(59, 65, 75, 1);
font-family: Microsoft YaHei;
font-size: 14px;
font-weight: 600;
line-height: 14px;
line-height: 22px;
text-align: left;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
// overflow: hidden;
// text-overflow: ellipsis;
// white-space: nowrap;
.title-active {
color: var(--color-main-active);
}
}
.content {
margin-top: 6px;
height: 14px;
// height: 14px;
color: rgba(132, 136, 142, 1);
font-family: Microsoft YaHei;
font-size: 14px;
font-weight: 400;
line-height: 14px;
line-height: 24px;
text-align: left;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
// overflow: hidden;
// text-overflow: ellipsis;
// white-space: nowrap;
.content-active {
color: var(--color-main-active);
}
......
src/views/bill/template/utils/piechart.js
浏览文件 @ 81d616e5
const getPieChart = (data,colorList) => {
const getPieChart = (data, colorList) => {
let option = {
color: colorList,
// color: colorList,
series: [
{
type: 'pie',
minAngle: 28,
radius: [70, 100],
height: '100%',
left: 'center',
......@@ -18,18 +17,28 @@ const getPieChart = (data,colorList) => {
formatter: '{name|{b}}\n{time|{c} 条 {d}%}',
minMargin: 5,
edgeDistance: 10,
lineHeight: 15,
lineHeight: 18,
rich: {
name: {
color: 'rgba(59, 65, 75, 1)',
fontFamily: 'Microsoft YaHei',
fontSize: 14,
fontWeight: 'bold',
padding: [10, 0, 10, 0]
},
time: {
fontSize: 10,
color: '#999'
fontSize: 14,
fontFamily: 'Microsoft YaHei',
color: '#rgba(95, 101, 108, 1)',
padding: [10, 0, 10, 0]
}
}
},
labelLine: {
length: 15,
length2: 0,
maxSurfaceAngle: 80
maxSurfaceAngle: 88
},
labelLayout: function (params) {
const isLeft = params.labelRect.x < 556 / 2;
......@@ -39,9 +48,7 @@ const getPieChart = (data,colorList) => {
? params.labelRect.x
: params.labelRect.x + params.labelRect.width;
return {
labelLinePoints: points,
hideOverlap: false,
moveOverlap: 'shiftY'
labelLinePoints: points
};
},
data: data
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论