提交 32e70bc0 authored 作者: coderBryanFu's avatar coderBryanFu

update

上级 b3389540
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
<span>新增排华联盟预警</span> <span>新增排华联盟预警</span>
</div> </div>
<div class="warning-content"> <div class="warning-content">
<div class="content-item" v-for="item in warningList"> <div class="content-item" v-for="item,index in warningList" :key="index">
<div class="item-title"> <div class="item-title">
<div class="title-left"> <div class="title-left">
<div class="img-list"> <div class="img-list">
...@@ -117,6 +117,7 @@ ...@@ -117,6 +117,7 @@
@error="e => (e.target.src = defaultImg)" @error="e => (e.target.src = defaultImg)"
alt alt
v-for="(ele, index) in item.countryList" v-for="(ele, index) in item.countryList"
:key="index"
/> />
</div> </div>
<div class="left-content">{{ getContent(item.countryList) }}</div> <div class="left-content">{{ getContent(item.countryList) }}</div>
...@@ -124,7 +125,7 @@ ...@@ -124,7 +125,7 @@
<div class="title-right">{{ item.statementList?.length }}次合作</div> <div class="title-right">{{ item.statementList?.length }}次合作</div>
</div> </div>
<div class="item-content"> <div class="item-content">
<div class="content-list" v-for="ele in item.statementList"> <div class="content-list" v-for="ele,idx in item.statementList" :key="idx" @click="handleClick(ele)">
<div class="list-left" :class="getTagClass(getName(ele.industryList))"> <div class="list-left" :class="getTagClass(getName(ele.industryList))">
<span>{{ getName(ele.industryList) }}</span> <span>{{ getName(ele.industryList) }}</span>
</div> </div>
...@@ -1743,7 +1744,10 @@ watch(activeDate, async () => { ...@@ -1743,7 +1744,10 @@ watch(activeDate, async () => {
height: 38px; height: 38px;
align-items: center; align-items: center;
justify-content: space-around; justify-content: space-around;
cursor: pointer;
&:hover{
background: var(--color-bg-hover);
}
.list-left { .list-left {
/* 数据展示/Tag标签/亮色/绿 */ /* 数据展示/Tag标签/亮色/绿 */
min-width: 75px; min-width: 75px;
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
</div> </div>
<div class="box1-main"> <div class="box1-main">
<div class="left"> <div class="left">
<el-empty v-if="siderList.length === 0" description="暂无数据" :image-size="100" /> <el-empty v-if="siderList.length === 0" style="padding-top: 240px;" description="暂无数据" :image-size="100" />
<div <div
class="left-item" class="left-item"
:class="{ leftItemActive: siderActiveIndex === index }" :class="{ leftItemActive: siderActiveIndex === index }"
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
<div class="title">{{ "政令主要内容" }}</div> <div class="title">{{ "政令主要内容" }}</div>
</div> </div>
<div class="list-main"> <div class="list-main">
<el-empty v-if="showList.length === 0" description="暂无数据" :image-size="200" /> <el-empty v-if="showList.length === 0" style="padding-top: 150px;" description="暂无数据" :image-size="100" />
<div class="list-item" v-for="(val, idx) in showList" :key="idx"> <div class="list-item" v-for="(val, idx) in showList" :key="idx">
<div class="id">{{ idx + 1 }}</div> <div class="id">{{ idx + 1 }}</div>
<div class="title">{{ val.content }}</div> <div class="title">{{ val.content }}</div>
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
</div> </div>
</div> </div>
<div class="box1-main"> <div class="box1-main">
<el-empty v-if="backgroundList.length === 0" style="padding-top: 60px;" description="暂无数据" :image-size="100" />
<div class="box1-item" v-for="(item, index) in backgroundList" :key="index"> <div class="box1-item" v-for="(item, index) in backgroundList" :key="index">
<div class="id">{{ index + 1 }}</div> <div class="id">{{ index + 1 }}</div>
<div class="title">{{ item.content }}</div> <div class="title">{{ item.content }}</div>
...@@ -101,7 +102,7 @@ ...@@ -101,7 +102,7 @@
</div> </div>
</div> </div>
<div class="box3-main"> <div class="box3-main">
<el-empty v-if="!laws.length" description="暂无数据" :image-size="100" /> <el-empty v-if="!laws.length" style="padding-top: 200px;" description="暂无数据" :image-size="100" />
<div class="box3-item" v-for="(item, index) in laws" :key="index" @click="handleToBillDetail(item)"> <div class="box3-item" v-for="(item, index) in laws" :key="index" @click="handleToBillDetail(item)">
<div class="id">{{ index + 1 }}</div> <div class="id">{{ index + 1 }}</div>
<div class="item-header"> <div class="item-header">
......
...@@ -2,10 +2,13 @@ ...@@ -2,10 +2,13 @@
<div class="page-container"> <div class="page-container">
<div class="page-header"> <div class="page-header">
<div class="page-header-left"> <div class="page-header-left">
<el-image :src="summaryInfo.newsImg" alt="新闻" class="page-header-left-img"></el-image> <el-image
:src="summaryInfo.newsImage ? summaryInfo.newsImage : DefaultNewsImage"
alt="新闻"
class="page-header-left-img"
></el-image>
<div class="page-header-left-top"> <div class="page-header-left-top">
<div class="page-header-left-top-title">{{ summaryInfo.newsTitle }}</div> <div class="page-header-left-top-title">{{ summaryInfo.newsTitle }}</div>
<div class="page-header-left-top-en">{{ summaryInfo.newsETitle }}</div>
<div class="page-header-left-top-desc"> <div class="page-header-left-top-desc">
<div class="text">{{ summaryInfo.newsDateTime }} · {{ summaryInfo.newsOrg }}</div> <div class="text">{{ summaryInfo.newsDateTime }} · {{ summaryInfo.newsOrg }}</div>
<div class="tag-box"> <div class="tag-box">
...@@ -47,18 +50,14 @@ ...@@ -47,18 +50,14 @@
</div> </div>
</div> </div>
</div> --> </div> -->
<el-empty v-if="!newsContentInfo.newsContent" description="暂无新闻内容数据" :image-size="150" />
<div class="main-content"> <div class="main-content">
<!-- {{ newsContentInfo.newsContent }} --> <!-- {{ newsContentInfo.newsContent }} -->
{{ {{ newsContentInfo.newsContent }}
` 据华盛顿邮报报道,了解谈判情况的知情人士透露,美国众议院 共和党人正在起草一项新的提案,以限制美国对华投资。目前参议院 已将其相关法案作为国防政策立法的一部分通过。
谈判各方希望能在11月7日前就这项措施的文本达成共识(尽管政府停摆 可能推迟这一日期)。该措施已将财政部的反馈意见纳入肯塔基州 共和党众议员安迪·巴尔 的配套提案中。
此后,议员们将利用这份文本来与参议员进行协商,以决定哪些内容能最终纳入定版的《国防授权法案》 中。
在上届国会期间,类似的立法尝试曾因北卡罗来纳州 共和党前众议员帕特里克·麦克亨利 的反对而失败。但在本届国会中,一位知情人士表示,“现在所有人实际上都在共同努力”。
该人士还补充说,领导层并不担心此举会剥夺特朗普 总统的一个谈判工具。`
}}
</div> </div>
<div class="main-img-box"> <el-empty v-if="!newsContentInfo.newsImage" description="暂无图片数据" :image-size="100" />
<img :src="newsContentInfo.newsImage" alt="新闻图片" /> <div class="main-img-box" v-if="newsContentInfo.newsImage">
<img :src="newsContentInfo.newsImage" alt="" />
</div> </div>
</div> </div>
</div> </div>
...@@ -70,7 +69,12 @@ ...@@ -70,7 +69,12 @@
<div class="title">{{ "相关新闻" }}</div> <div class="title">{{ "相关新闻" }}</div>
</div> </div>
<div class="box2-main"> <div class="box2-main">
<el-empty v-if="!relevantNews.length" description="暂无数据" :image-size="200" /> <el-empty
v-if="!relevantNews.length"
style="padding-top: 120px"
description="暂无数据"
:image-size="150"
/>
<div v-else class="box2-item" v-for="(item, index) in relevantNews" :key="index"> <div v-else class="box2-item" v-for="(item, index) in relevantNews" :key="index">
<div class="box2-item-left"> <div class="box2-item-left">
<img :src="item.newsImage" alt="" /> <img :src="item.newsImage" alt="" />
...@@ -97,11 +101,12 @@ import newsImg from "@/assets/images/img-news.png"; ...@@ -97,11 +101,12 @@ import newsImg from "@/assets/images/img-news.png";
import openIcon from "@/assets/images/icon-open.png"; import openIcon from "@/assets/images/icon-open.png";
import dotIcon from "@/assets/images/dot.png"; import dotIcon from "@/assets/images/dot.png";
import { ElMessage } from "element-plus"; import { ElMessage } from "element-plus";
import DefaultNewsImage from "@/assets/icons/default-icon-news.png";
const route = useRoute(); const route = useRoute();
const summaryInfo = ref({ const summaryInfo = ref({
newsImg: "", newsImage: "",
newsTitle: "", newsTitle: "",
newsETitle: "", newsETitle: "",
newsDateTime: "", newsDateTime: "",
...@@ -298,15 +303,16 @@ onMounted(() => { ...@@ -298,15 +303,16 @@ onMounted(() => {
gap: 15px; gap: 15px;
margin-right: auto; margin-right: auto;
&-img { &-img {
width: 72px; width: auto;
height: 72px; height: 72px;
} }
&-top { &-top {
height: 72px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: flex-start; align-items: flex-start;
justify-content: flex-start; justify-content: center;
gap: 5px; gap: 12px;
&-title { &-title {
color: rgba(59, 65, 75, 1); color: rgba(59, 65, 75, 1);
height: 32px; height: 32px;
...@@ -318,17 +324,7 @@ onMounted(() => { ...@@ -318,17 +324,7 @@ onMounted(() => {
letter-spacing: 0px; letter-spacing: 0px;
text-align: left; text-align: left;
} }
&-en {
height: 24px;
color: rgba(59, 65, 75, 1);
font-family: Microsoft YaHei;
font-style: Regular;
font-size: 16px;
font-weight: 400;
line-height: 24px;
letter-spacing: 0px;
text-align: left;
}
&-desc { &-desc {
height: 24px; height: 24px;
display: flex; display: flex;
...@@ -488,6 +484,7 @@ onMounted(() => { ...@@ -488,6 +484,7 @@ onMounted(() => {
line-height: 30px; line-height: 30px;
letter-spacing: 0px; letter-spacing: 0px;
text-align: justify; text-align: justify;
text-indent: 2em;
} }
.main-img-box { .main-img-box {
margin-top: 30px; margin-top: 30px;
......
...@@ -44,6 +44,7 @@ export default defineConfig({ ...@@ -44,6 +44,7 @@ export default defineConfig({
port: 3000, port: 3000,
open: true, open: true,
proxy: { proxy: {
'/api': { '/api': {
target: 'http://8.140.26.4:9085/', target: 'http://8.140.26.4:9085/',
changeOrigin: true, changeOrigin: true,
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论