Skip to content

R
risk-monitor
提交 1ede3f2e authored 作者: 张烨's avatar 张烨
浏览文件
操作

feat:科技政令详情页增加政令举措

上级 341ad3c5
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 79 行增加 和 94 行删除
src/App.vue
浏览文件 @ 1ede3f2e
......@@ -294,6 +294,13 @@ body {
.el-popper[data-popper-placement^="top"]>.el-popper__arrow:before {
display: none;
}
/* 单行文本溢出隐藏显示省略号 */
.one-line-ellipsis {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
</style>
<style lang="scss" scoped>
......
src/router/modules/decree.js
浏览文件 @ 1ede3f2e
......@@ -4,6 +4,7 @@ import DecreeLayoutContainer from "@/views/decree/decreeLayout/index.vue";
import DecreeOverviewLayout from "@/views/decree/decreeLayout/overview/index.vue";
import DecreeIntroduction from "@/views/decree/decreeLayout/overview/introduction/index.vue";
import DecreeBackground from "@/views/decree/decreeLayout/overview/background/index.vue";
import DecreeMeasures from "@/views/decree/decreeLayout/overview/measures/index.vue";
import DecreeDeepDig from "@/views/decree/decreeLayout/deepdig/index.vue";
import DecreeInfluence from "@/views/decree/decreeLayout/influence/index.vue";
import Institution from "@/views/decree/institution/index.vue"
......@@ -49,7 +50,13 @@ const decreeRoutes = [
name: "DecreeBackground",
component: DecreeBackground,
// meta: { title: "政令背景" }
}
},
{
path: "measures",
name: "DecreeMeasures",
component: DecreeMeasures,
// meta: { title: "政令举措" }
},
]
},
// 深度挖掘路由
......
src/styles/main.css
浏览文件 @ 1ede3f2e
......@@ -23,9 +23,9 @@
--tag-btn1-border-color: rgba(255, 204, 199, 1);
--tag-btn1-text-color: rgba(255, 77, 79, 1);
--tag-btn2-bg-color: rgba(255, 251, 230, 1);
--tag-btn2-border-color: rgba(255, 241, 184, 1);
--tag-btn2-text-color: rgba(250, 173, 20, 1);
--tag-btn4-bg-color: rgba(255, 251, 230, 1);
--tag-btn4-border-color: rgba(255, 241, 184, 1);
--tag-btn4-text-color: rgba(250, 173, 20, 1);
--tag-btn2-bg-color: rgba(230, 244, 255, 1);
--tag-btn2-border-color: rgba(186, 224, 255, 1);
......
src/views/decree/decreeHome/index.vue
浏览文件 @ 1ede3f2e
......@@ -274,25 +274,24 @@
<DivideHeader id="position4" class="divide4" :titleText="'资源库'"></DivideHeader>
<div class="home-main-footer-header">
<div class="search-box">
<el-select v-model="searchType" style="width: 100%">
<el-option label="全部政府部门" value=" " />
<el-select v-model="searchType" :empty-values="[null, undefined]" style="width: 100%">
<el-option label="全部政府部门" value="" />
<el-option v-for="item in govInsList" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</div>
<div style="flex: auto;"></div>
<el-checkbox v-model="isChina">只看涉华政令</el-checkbox>
<div class="select-box">
<div class="paixu-btn" @click="handleSwithSort">
<div class="icon1">
<img v-if="isSort" src="@/assets/icons/shengxu1.png" alt="" />
<img v-else src="@/assets/icons/jiangxu1.png" alt="" />
</div>
<div class="text">{{ "发布时间" }}</div>
<div class="icon2">
<img v-if="isSort" src="@/assets/icons/shengxu2.png" alt="" />
<img v-else src="@/assets/icons/jiangxu2.png" alt="" />
</div>
</div>
<el-select v-model="isSort" placeholder="发布时间" style="width:120px; margin-left:8px;">
<template #prefix>
<div class="icon1">
<img v-if="isSort" src="@/assets/icons/shengxu1.png" alt="" />
<img v-else src="@/assets/icons/jiangxu1.png" alt="" />
</div>
</template>
<el-option label="正序" :value="true" />
<el-option label="倒序" :value="false" />
</el-select>
</div>
</div>
<div class="home-main-footer-main">
......@@ -983,12 +982,9 @@ const handleBox8 = async () => {
};
// 资源库
const searchType = ref(" ");
const searchType = ref("");
const isChina = ref(false);
const isSort = ref(false); // true 升序 false 倒序
const handleSwithSort = () => {
isSort.value = !isSort.value;
};
const isSort = ref(false); // true 升序 false 降序
const handleToPosi = id => {
const element = document.getElementById(id);
......@@ -1175,7 +1171,7 @@ const handleGetDecreeOrderList = async () => {
researchTypeIds: p1, // 全选时不传（为空）
sortFun: isSort.value,
isCN: isChina.value ? 1 : 0,
proposeName: searchType.value.trim(),
proposeName: searchType.value,
years: p2, // 全选时不传（为空）
typeIds: checkedDecreeType.value.toString()
};
......@@ -1207,7 +1203,8 @@ const handleGetDecreeOrderList = async () => {
};
watch([activePubTime, activeAreaList, checkedGovIns, isSort, isChina, searchType], val => {
handleGetDecreeOrderList();
// 切换页码到第一页
handleCurrentChange(1);
});
// 切换当前政令
......@@ -3115,62 +3112,26 @@ onMounted(async () => {
}
.select-box {
margin-left: 20px;
margin-left: 10px;
height: 42px;
box-sizing: border-box;
padding: 5px 0;
.paixu-btn {
display: flex;
width: 120px;
height: 32px;
box-sizing: border-box;
border: 1px solid rgba(230, 231, 232, 1);
border-radius: 4px;
background: rgba(255, 255, 255, 1);
&:hover {
background: var(--color-bg-hover);
}
cursor: pointer;
.icon1 {
width: 11px;
height: 14px;
margin-top: 10px;
margin-left: 9px;
img {
width: 100%;
height: 100%;
}
}
.icon1 {
width: 11px;
height: 14px;
font-size: 0px;
.text {
height: 19px;
color: rgba(95, 101, 108, 1);
font-family: Microsoft YaHei;
font-size: 14px;
font-weight: 400;
line-height: 18px;
letter-spacing: 0px;
text-align: left;
margin-top: 7px;
margin-left: 9px;
img {
width: 100%;
height: 100%;
}
}
.icon2 {
width: 10px;
height: 5px;
margin-top: 5px;
margin-left: 13px;
img {
width: 100%;
height: 100%;
}
}
:deep(.el-select__selected-item) {
text-align: center;
font-size: 16px;
font-family: Microsoft YaHei;
}
}
}
......@@ -3374,18 +3335,6 @@ onMounted(async () => {
color: rgba(255, 149, 77, 1);
background: rgba(255, 149, 77, 0.1);
}
// .type1 {
// color: rgba(22, 119, 255, 1);
// background: rgba(230, 244, 255, 1);
// }
// .type2 {
// color: rgba(19, 168, 168, 1);
// background: rgba(230, 255, 251, 1);
// }
// .type3 {
// color: rgba(250, 140, 22, 1);
// background: rgba(255, 247, 230, 1);
// }
}
.desc {
......@@ -3416,8 +3365,8 @@ onMounted(async () => {
text-align: center;
padding: 0 8px;
border-radius: 4px;
background: rgba(231, 243, 255, 1);
color: var(--color-main-active);
background: var(--btn-active-bg-color);
color: var(--btn-active-text-color);
font-family: Microsoft YaHei;
font-size: 14px;
font-weight: 400;
......
src/views/decree/decreeLayout/index.vue
浏览文件 @ 1ede3f2e
......@@ -60,7 +60,7 @@
</div>
<div class="text">{{ "政令原文" }}</div>
</div>
<div class="btn">
<div class="btn" @click="handleToInstitution">
<div class="icon">
<img src="./assets/icons/link-icon.png" alt="" />
</div>
......@@ -277,6 +277,16 @@ const handleShowReport = () => {
window.open(curRoute.href, "_blank");
};
const handleToInstitution = () => {
// const curRoute = router.resolve({
// path: "/institution",
// query: {
// id: route.query.id
// }
// });
// window.open(curRoute.href, "_blank");
};
const handleAnalysisClick = () => {
router.push({
path: "/writtingAsstaint",
......@@ -290,7 +300,7 @@ const handleAnalysisClick = () => {
onMounted(() => {
handleGetSummary();
console.log(route.path);
if (route.path === "/decreeLayout/overview/introduction" || route.path === "/decreeLayout/overview/background") {
if (route.path === "/decreeLayout/overview/introduction" || route.path === "/decreeLayout/overview/background" || route.path === "/decreeLayout/overview/measures") {
activeTitle.value = "政令概况";
} else if (route.path === "/decreeLayout/deepDig") {
activeTitle.value = "深度挖掘";
......
src/views/decree/decreeLayout/overview/index.vue
浏览文件 @ 1ede3f2e
......@@ -35,7 +35,11 @@ const siderList = ref([
{
name: "政令背景",
path: "/decreeLayout/overview/background"
}
},
{
name: "政令举措",
path: "/decreeLayout/overview/measures"
},
]);
const siderBtnActive = ref("政令简介");
......@@ -51,10 +55,18 @@ const handleClickLeftSiderBtn = item => {
};
onMounted(() => {
if (route.path === "/decreeLayout/overview/introduction") {
siderBtnActive.value = "政令简介";
} else {
siderBtnActive.value = "政令背景";
switch (route.path) {
case "/decreeLayout/overview/introduction":
siderBtnActive.value = "政令简介";
break;
case "/decreeLayout/overview/background":
siderBtnActive.value = "政令背景";
break;
case "/decreeLayout/overview/measures":
siderBtnActive.value = "政令举措";
break;
default:
siderBtnActive.value = "政令简介";
}
});
</script>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论