Skip to content

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

update

上级 e98332ff
隐藏空白字符变更
内嵌 并排
正在显示 包含 150 行增加 和 92 行删除
src/views/bill/billHome/index.vue
浏览文件 @ ddb5cdcb
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
{{ "查看详情 >" }} {{ "查看详情 >" }}
</div> </div>
</div> </div>
<div class="box1-main" style="display: block;"> <div class="box1-main" style="display: block">
<el-carousel <el-carousel
ref="carouselRef" ref="carouselRef"
height="354px" height="354px"
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
@change="handleCarouselChange" @change="handleCarouselChange"
> >
<el-carousel-item v-for="(bill, billIndex) in hotBillList" :key="billIndex"> <el-carousel-item v-for="(bill, billIndex) in hotBillList" :key="billIndex">
<div class="carousel-content" style="display: flex; height: 100%;"> <div class="carousel-content" style="display: flex; height: 100%">
<div class="box1-main-left"> <div class="box1-main-left">
<div class="box1-main-left-title"> <div class="box1-main-left-title">
<!-- "H.R.1(119th)-大而美法案" --> <!-- "H.R.1(119th)-大而美法案" -->
...@@ -292,7 +292,7 @@ ...@@ -292,7 +292,7 @@
</div> </div>
<div class="box4-main"> <div class="box4-main">
<div class="box4-main-item" v-for="(item, index) in messageList" :key="index"> <div class="box4-main-item" v-for="(item, index) in messageList" :key="index">
<div class="left" @click="handleClcikToCharacter(item,index)"> <div class="left" @click="handleClcikToCharacter(item, index)">
<img :src="item.personImage" alt="" /> <img :src="item.personImage" alt="" />
</div> </div>
<div class="right"> <div class="right">
...@@ -439,7 +439,7 @@ ...@@ -439,7 +439,7 @@
class="box8-main-item" class="box8-main-item"
v-for="(item, index) in box8Data" v-for="(item, index) in box8Data"
:key="index" :key="index"
@click="handleClcikToCharacter(item,index)" @click="handleClcikToCharacter(item, index)"
> >
<div class="box8-main-item-left"> <div class="box8-main-item-left">
<img :src="item.img" alt="" referrerpolicy="no-referrer" class="left-img" /> <img :src="item.img" alt="" referrerpolicy="no-referrer" class="left-img" />
...@@ -641,59 +641,65 @@ ...@@ -641,59 +641,65 @@
</div> </div>
</div> </div>
<div class="right-main" v-loading="loading"> <div class="right-main" v-loading="loading">
<<<<<<< HEAD <<<<<<< HEAD
<div class="right-main-box" v-for="(item, index) in bills" :key="index" @click="handleClickToDetailO(item)">
=======
<div <div
class="right-main-box" class="right-main-box"
v-for="(item, index) in bills" v-for="(item, index) in bills"
:key="index" :key="index"
@click="handleClickToDetail()" @click="handleClickToDetailO(item)"
> >
>>>>>>> e641835b10377b442772bb20faa9c6a12d09b494 =======
<div class="header"> <div
<div class="title">{{ item.name }}</div> class="right-main-box"
<div class="en-title">{{ item.eName }}</div> v-for="(item, index) in bills"
</div> :key="index"
<div class="main"> @click="handleClickToDetail()"
<div class="item"> >
<div class="item-left">{{ "提案人：" }}</div> >>>>>>> e641835b10377b442772bb20faa9c6a12d09b494
<div class="item-right">{{ item.tcr }}</div> <div class="header">
</div> <div class="title">{{ item.name }}</div>
<div class="item"> <div class="en-title">{{ item.eName }}</div>
<div class="item-left">{{ "委员会：" }}</div>
<div class="item-right">{{ item.wyh }}</div>
</div> </div>
<div class="item"> <div class="main">
<div class="item-left">{{ "相关领域：" }}</div> <div class="item">
<div class="item-right1"> <div class="item-left">{{ "提案人：" }}</div>
<div class="tag" v-for="(val, idx) in item.areaList" :key="idx">{{ val }}</div> <div class="item-right">{{ item.tcr }}</div>
</div>
<div class="item">
<div class="item-left">{{ "委员会：" }}</div>
<div class="item-right">{{ item.wyh }}</div>
</div>
<div class="item">
<div class="item-left">{{ "相关领域：" }}</div>
<div class="item-right1">
<div class="tag" v-for="(val, idx) in item.areaList" :key="idx">{{ val }}</div>
</div>
</div>
<div class="item">
<div class="item-left">{{ "最新动议：" }}</div>
<div class="item-right">{{ item.zxdy }}</div>
</div>
<div class="item">
<div class="item-left">{{ "法案进展：" }}</div>
<div class="item-right2"></div>
</div> </div>
</div>
<div class="item">
<div class="item-left">{{ "最新动议：" }}</div>
<div class="item-right">{{ item.zxdy }}</div>
</div>
<div class="item">
<div class="item-left">{{ "法案进展：" }}</div>
<div class="item-right2"></div>
</div> </div>
</div> </div>
</div> </div>
</div> <div class="right-footer">
<div class="right-footer"> <div class="footer-left">
<div class="footer-left"> {{ `共${total}项调查` }}
{{ `共${total}项调查` }} </div>
</div> <div class="footer-right">
<div class="footer-right"> <el-pagination
<el-pagination @current-change="handleCurrentChange"
@current-change="handleCurrentChange" :page-size="pageSize"
:page-size="pageSize" :current-page="currentPage"
:current-page="currentPage" background
background layout="prev, pager, next"
layout="prev, pager, next" :total="total"
:total="total" />
/> </div>
</div> </div>
</div> </div>
</div> </div>
...@@ -790,7 +796,7 @@ const formatMessageTime = timeStr => { ...@@ -790,7 +796,7 @@ const formatMessageTime = timeStr => {
}; };
// 跳转人物主页 // 跳转人物主页
const handleClcikToCharacter = (item,index) => { const handleClcikToCharacter = (item, index) => {
window.sessionStorage.setItem("memberId", item.memberId); window.sessionStorage.setItem("memberId", item.memberId);
let type; let type;
if (index === 0) { if (index === 0) {
...@@ -830,7 +836,7 @@ const hotBillList = ref([]); // 热门法案列表 ...@@ -830,7 +836,7 @@ const hotBillList = ref([]); // 热门法案列表
const curHotBillListIndex = ref(0); // 当前热门法案索引 const curHotBillListIndex = ref(0); // 当前热门法案索引
const carouselRef = ref(null); const carouselRef = ref(null);
const handleCarouselChange = (index) => { const handleCarouselChange = index => {
curHotBillListIndex.value = index; curHotBillListIndex.value = index;
if (hotBillList.value && hotBillList.value.length > 0) { if (hotBillList.value && hotBillList.value.length > 0) {
curBill.value = hotBillList.value[index]; curBill.value = hotBillList.value[index];
...@@ -863,7 +869,7 @@ const handleClickToDetail = () => { ...@@ -863,7 +869,7 @@ const handleClickToDetail = () => {
window.open(route.href, "_blank"); window.open(route.href, "_blank");
}; };
// 查看详情 传递参数 // 查看详情 传递参数
const handleClickToDetailO = (item) => { const handleClickToDetailO = item => {
window.sessionStorage.setItem("billId", item.billId); window.sessionStorage.setItem("billId", item.billId);
const route = router.resolve("/billLayout"); const route = router.resolve("/billLayout");
window.open(route.href, "_blank"); window.open(route.href, "_blank");
......
src/views/decree/decreeHome/index.vue
浏览文件 @ ddb5cdcb
...@@ -116,16 +116,16 @@ ...@@ -116,16 +116,16 @@
<div class="home-main-center"> <div class="home-main-center">
<div class="center-top"> <div class="center-top">
<div class="box1"> <div class="box1">
<!-- <div class="box1-left"> <div class="box1-left" @click="handleSwithCurDecree('left')">
<div class="icon"> <div class="icon">
<img src="./assets/images/box1-left.png" alt="" /> <img src="./assets/images/box1-left.png" alt="" />
</div> </div>
</div> </div>
<div class="box1-right"> <div class="box1-right" @click="handleSwithCurDecree('right')">
<div class="icon"> <div class="icon">
<img src="./assets/images/box1-right.png" alt="" /> <img src="./assets/images/box1-right.png" alt="" />
</div> </div>
</div> --> </div>
<div class="box1-header"> <div class="box1-header">
<div class="box1-header-left"> <div class="box1-header-left">
<div class="icon"> <div class="icon">
...@@ -137,7 +137,15 @@ ...@@ -137,7 +137,15 @@
{{ "查看详情 >" }} {{ "查看详情 >" }}
</div> </div>
</div> </div>
<el-carousel ref="carouselRef" trigger="click" height="395px" :autoplay="true"> <el-carousel
ref="carouselRef"
height="395px"
:autoplay="true"
:interval="3000"
arrow="never"
indicator-position="none"
@change="handleCarouselChange"
>
<el-carousel-item v-for="(item, index) in box1DataList" :key="index"> <el-carousel-item v-for="(item, index) in box1DataList" :key="index">
<div class="box1-main"> <div class="box1-main">
<div class="box1-main-left"> <div class="box1-main-left">
...@@ -1116,6 +1124,15 @@ watch( ...@@ -1116,6 +1124,15 @@ watch(
} }
); );
// 切换当前政令
const handleSwithCurDecree = name => {
if (name === "left") {
carouselRef.value.prev();
} else {
carouselRef.value.next();
}
};
onMounted(async () => { onMounted(async () => {
handleGetAreaList(); handleGetAreaList();
handleGetDecreeOrderList(); handleGetDecreeOrderList();
...@@ -1452,6 +1469,7 @@ onMounted(async () => { ...@@ -1452,6 +1469,7 @@ onMounted(async () => {
position: relative; position: relative;
.box1-left { .box1-left {
position: absolute; position: absolute;
z-index: 9999;
left: 0; left: 0;
top: 200px; top: 200px;
width: 24px; width: 24px;
...@@ -1472,6 +1490,7 @@ onMounted(async () => { ...@@ -1472,6 +1490,7 @@ onMounted(async () => {
} }
.box1-right { .box1-right {
position: absolute; position: absolute;
z-index: 9999;
right: 0; right: 0;
top: 200px; top: 200px;
width: 24px; width: 24px;
......
src/views/exportControl/index.vue
浏览文件 @ ddb5cdcb
...@@ -91,7 +91,24 @@ ...@@ -91,7 +91,24 @@
<template #default> <template #default>
<div class="box1"> <div class="box1">
<el-carousel ref="carouselRef" trigger="click" height="350px" :autoplay="true"> <div class="box1-left-arrow" @click="handleSwithCurPolicy('left')">
<div class="icon">
<img src="./assets/images/box1-left.png" alt="" />
</div>
</div>
<div class="box1-right-arrow" @click="handleSwithCurPolicy('right')">
<div class="icon">
<img src="./assets/images/box1-right.png" alt="" />
</div>
</div>
<el-carousel
ref="carouselRef"
height="350px"
:autoplay="true"
:interval="3000"
arrow="never"
indicator-position="none"
>
<el-carousel-item v-for="(item, index) in entitiesDataInfoList" :key="item.id + index"> <el-carousel-item v-for="(item, index) in entitiesDataInfoList" :key="item.id + index">
<div> <div>
<div class="box1-top"> <div class="box1-top">
...@@ -730,7 +747,7 @@ const newsList = ref([]); ...@@ -730,7 +747,7 @@ const newsList = ref([]);
onMounted(async () => { onMounted(async () => {
try { try {
const [dataCount, entitiesDataInfo, industryCountByYear,cclList, countDomainByYear] = await Promise.all([ const [dataCount, entitiesDataInfo, industryCountByYear, cclList, countDomainByYear] = await Promise.all([
getEntitiesDataCount(), getEntitiesDataCount(),
getEntitiesDataInfo(), getEntitiesDataInfo(),
getIndustryCountByYear(1), getIndustryCountByYear(1),
...@@ -1459,6 +1476,15 @@ const handleNewsInfoClick = item => { ...@@ -1459,6 +1476,15 @@ const handleNewsInfoClick = item => {
window.open(route.href, "_blank"); window.open(route.href, "_blank");
}; };
// 切换当前出口管制政策
const handleSwithCurPolicy = name => {
if (name === "left") {
carouselRef.value.prev();
} else {
carouselRef.value.next();
}
};
onMounted(async () => { onMounted(async () => {
handleGetHylyList(); handleGetHylyList();
let chart1 = getMultiLineChart(chart1Data.value.title, chart1Data.value.data[0].value, chart1Data.value.data[1].value); let chart1 = getMultiLineChart(chart1Data.value.title, chart1Data.value.data[0].value, chart1Data.value.data[1].value);
...@@ -1521,6 +1547,48 @@ const handleMediaClick = item => { ...@@ -1521,6 +1547,48 @@ const handleMediaClick = item => {
flex-direction: column; flex-direction: column;
gap: 20px; gap: 20px;
position: relative; position: relative;
.box1-left-arrow {
position: absolute;
z-index: 9999;
left: -20px;
top: 135px;
width: 24px !important;
height: 48px;
background: #e7f1ff;
display: flex;
justify-content: center;
align-items: center;
cursor: pointer;
.icon {
width: 11px;
height: 18px;
img {
width: 100%;
height: 100%;
}
}
}
.box1-right-arrow {
position: absolute;
z-index: 9999;
right: -20px;
top:135px;
width: 24px;
height: 48px;
background: #e7f1ff;
display: flex;
justify-content: center;
align-items: center;
cursor: pointer;
.icon {
width: 11px;
height: 18px;
img {
width: 100%;
height: 100%;
}
}
}
.box1-absolute { .box1-absolute {
position: absolute; position: absolute;
width: 240px; width: 240px;
...@@ -2062,44 +2130,9 @@ const handleMediaClick = item => { ...@@ -2062,44 +2130,9 @@ const handleMediaClick = item => {
gap: 20px; gap: 20px;
.box1 { .box1 {
display: flex; display: flex;
gap: 10px; gap: 10px;
position: relative; position: relative;
// .box1-left {
// position: absolute;
// left: 0;
// top: 200px;
// width: 24px;
// height: 48px;
// background: #e7f1ff;
// display: flex;
// justify-content: center;
// align-items: center;
// cursor: pointer;
// .icon {
// width: 11px;
// height: 18px;
// img {
// width: 100%;
// height: 100%;
// }
// }
// }
.box1-right {
display: flex;
justify-content: center;
flex-direction: column;
align-items: center;
cursor: pointer;
.icon {
width: 11px;
height: 18px;
img {
width: 100%;
height: 100%;
}
}
}
.box1-header { .box1-header {
height: 53px; height: 53px;
border-bottom: 1px solid rgba(240, 242, 244, 1); border-bottom: 1px solid rgba(240, 242, 244, 1);
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论