Skip to content

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

update

上级 f8e9daac
隐藏空白字符变更
内嵌 并排
正在显示 包含 57 行增加 和 53 行删除
src/router/modules/overview.js
浏览文件 @ 664303a2
...@@ -9,23 +9,23 @@ const overViewRoutes = [ ...@@ -9,23 +9,23 @@ const overViewRoutes = [
// path: "/", // path: "/",
// redirect: "/overview" // redirect: "/overview"
// }, // },
{ // {
path: "/overview", // path: "/overview",
name: "overView", // name: "overView",
component: overView, // component: overView,
meta: { // meta: {
title: "中美科技博弈概览" // title: "中美科技博弈概览"
} // }
}, // },
// GJ概览页面路由 // // GJ概览页面路由
{ // {
path: "/gjOverview", // path: "/gjOverview",
name: "gjOverView", // name: "gjOverView",
component: gjOverView, // component: gjOverView,
meta: { // meta: {
title: "国家概览" // title: "国家概览"
} // }
}, // },
] ]
......
src/views/ZMOverView/components/newRisk/index.vue
浏览文件 @ 664303a2
...@@ -120,10 +120,10 @@ ...@@ -120,10 +120,10 @@
{{ News.hotspotTag }} {{ News.hotspotTag }}
</div> </div>
</div> </div>
<img <!-- <img
:src="News.hotspotPicture ? News.hotspotPicture : DefaultOrgIcon" :src="News.hotspotPicture ? News.hotspotPicture : DefaultOrgIcon"
style="width: 96px; height: 96px" style="width: 96px; height: 96px"
/> /> -->
</div> </div>
<div <div
style="/* 矩形 351 */ width: 664px; height: 1px; background: rgba(234, 236, 238, 1)" style="/* 矩形 351 */ width: 664px; height: 1px; background: rgba(234, 236, 238, 1)"
...@@ -1426,7 +1426,7 @@ onUnmounted(() => { ...@@ -1426,7 +1426,7 @@ onUnmounted(() => {
justify-content: space-between; justify-content: space-between;
.title-text { .title-text {
/* 美国白宫发布关于进一步延长TikTok执法宽限期的行政令 */ /* 美国白宫发布关于进一步延长TikTok执法宽限期的行政令 */
width: 547px; width: 660px;
// height: 26px; // height: 26px;
} }
...@@ -1534,7 +1534,7 @@ onUnmounted(() => { ...@@ -1534,7 +1534,7 @@ onUnmounted(() => {
font-family: Source Han Sans CN; font-family: Source Han Sans CN;
font-style: bold; font-style: bold;
font-size: 16px; font-size: 16px;
font-weight: 400; font-weight: 700;
line-height: 24px; line-height: 24px;
letter-spacing: 0px; letter-spacing: 0px;
text-align: left; text-align: left;
......
src/views/bill/billHome/index.vue
浏览文件 @ 664303a2
...@@ -52,8 +52,8 @@ ...@@ -52,8 +52,8 @@
</div> </div>
</div> --> </div> -->
<div class="home-main"> <div class="home-main">
<div class="home-main-header" v-show="!isShow"> <div class="home-main-header">
<div class="home-main-header-center"> <div class="home-main-header-center" v-show="!isShow">
<el-input <el-input
v-model="searchBillText" v-model="searchBillText"
@keyup.enter="handleSearch" @keyup.enter="handleSearch"
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
<div class="item-footer">分析报告</div> <div class="item-footer">分析报告</div>
</div> </div>
</div> --> </div> -->
<div class="home-main-header-btn-box"> <div class="home-main-header-btn-box" v-show="!isShow">
<div class="btn" @click="handleToPosi('position1')"> <div class="btn" @click="handleToPosi('position1')">
<div class="btn-text">{{ "最新动态" }}</div> <div class="btn-text">{{ "最新动态" }}</div>
<div class="btn-icon"> <div class="btn-icon">
...@@ -719,7 +719,9 @@ ...@@ -719,7 +719,9 @@
<div class="right-main" v-loading="loading"> <div class="right-main" v-loading="loading">
<div class="right-main-box" v-for="(item, index) in bills" :key="index"> <div class="right-main-box" v-for="(item, index) in bills" :key="index">
<div class="header"> <div class="header">
<div class="title" @click="handleClickToDetailO(item)" :title="item.name">{{ item.name }}</div> <div class="title" @click="handleClickToDetailO(item)" :title="item.name">
{{ item.name }}
</div>
<div class="en-title" :title="item.eName">{{ item.eName }}</div> <div class="en-title" :title="item.eName">{{ item.eName }}</div>
</div> </div>
<div class="main"> <div class="main">
...@@ -1768,6 +1770,7 @@ onUnmounted(() => { ...@@ -1768,6 +1770,7 @@ onUnmounted(() => {
height: 144px; height: 144px;
background: #fff; background: #fff;
overflow: hidden; overflow: hidden;
box-shadow: 0px 0px 20px 0px rgba(25, 69, 130, 0.3);
.home-main-header-center { .home-main-header-center {
margin-top: 20px; margin-top: 20px;
margin-left: 200px; margin-left: 200px;
...@@ -1859,9 +1862,7 @@ onUnmounted(() => { ...@@ -1859,9 +1862,7 @@ onUnmounted(() => {
} }
} }
.scrollHomeBox { .scrollHomeBox {
width: 100%;
height: calc(100% - 144px); height: calc(100% - 144px);
overflow-y: auto;
} }
.home-box { .home-box {
position: relative; position: relative;
...@@ -3336,9 +3337,9 @@ onUnmounted(() => { ...@@ -3336,9 +3337,9 @@ onUnmounted(() => {
line-height: 26px; line-height: 26px;
letter-spacing: 0px; letter-spacing: 0px;
text-align: left; text-align: left;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
} }
.en-title { .en-title {
margin-top: 8px; margin-top: 8px;
...@@ -3350,9 +3351,9 @@ onUnmounted(() => { ...@@ -3350,9 +3351,9 @@ onUnmounted(() => {
line-height: 24px; line-height: 24px;
letter-spacing: 0px; letter-spacing: 0px;
text-align: left; text-align: left;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
} }
} }
.main { .main {
......
src/views/decree/decreeHome/index.vue
浏览文件 @ 664303a2
...@@ -44,15 +44,7 @@ ...@@ -44,15 +44,7 @@
</div> </div>
<div class="home-main" :class="{ scrollHomeMain: isShow }" ref="containerRef"> <div class="home-main" :class="{ scrollHomeMain: isShow }" ref="containerRef">
<div class="home-main-header"> <div class="home-main-header">
<!-- <div class="home-main-header-top" v-show="!isShow"> <div class="home-main-header-center">
<div class="header-left">
<HeaderMenu></HeaderMenu>
</div>
<div class="header-right">
<headerInfo curTitleName="政令"></headerInfo>
</div>
</div> -->
<div class="home-main-header-center" v-show="!isShow">
<el-input <el-input
v-model="searchDecreeText" v-model="searchDecreeText"
@keyup.enter="handleSearch" @keyup.enter="handleSearch"
......
src/views/decree/institution/index.vue
浏览文件 @ 664303a2
...@@ -34,8 +34,8 @@ ...@@ -34,8 +34,8 @@
</div> </div>
<div class="main"> <div class="main">
<InsDetail v-if="activeTabName === '机构详情'"></InsDetail> <InsDetail v-if="activeTabName === '机构详情'"></InsDetail>
<Deepdig v-else-if="activeTabName === '深度挖掘'"></Deepdig> <!-- <Deepdig v-else-if="activeTabName === '深度挖掘'"></Deepdig>
<Sanction v-else></Sanction> <Sanction v-else></Sanction> -->
</div> </div>
</div> </div>
</template> </template>
...@@ -49,6 +49,7 @@ import Sanction from "./sanction/index.vue"; ...@@ -49,6 +49,7 @@ import Sanction from "./sanction/index.vue";
import { getGovOrgBasicInfo } from "@/api/institution/index"; import { getGovOrgBasicInfo } from "@/api/institution/index";
import DefaultIcon2 from "@/assets/icons/default-icon2.png"; import DefaultIcon2 from "@/assets/icons/default-icon2.png";
import { ElMessage } from "element-plus";
const route = useRoute(); const route = useRoute();
...@@ -94,6 +95,10 @@ const tabList = ref([ ...@@ -94,6 +95,10 @@ const tabList = ref([
]); ]);
const handleClickTab = val => { const handleClickTab = val => {
if(val.name === '深度挖掘' || val.name === '对华制裁') {
ElMessage.warning('当前功能开发中，敬请期待！')
return
}
activeTabName.value = val.name; activeTabName.value = val.name;
window.sessionStorage.setItem("institutionActiveTabName", val.name); window.sessionStorage.setItem("institutionActiveTabName", val.name);
}; };
......
src/views/decree/institution/insDetail/index.vue
浏览文件 @ 664303a2
...@@ -155,12 +155,12 @@ const route = useRoute(); ...@@ -155,12 +155,12 @@ const route = useRoute();
// 基本信息 // 基本信息
const basicInfo = ref({ const basicInfo = ref({
image: Img, image: DefaultIcon2,
shijian: "1948年", shijian: "",
dizhi: "华盛顿特区宪法大道1401号赫伯特·C·胡佛大楼 ", dizhi: " ",
zhize: "国际贸易、进出口管制、经济数据统计及专利商标管理", zhize: "",
xiashujigou: "工业与安全局、国际贸易管理局、专利商标局等", xiashujigou: "",
zhicaishouduan: "实体清单、军事最终用户清单、​​“301条款”关税、​​“232条款”关税、特别指定国民清单" zhicaishouduan: ""
}); });
const handleGetBasicInfo = async () => { const handleGetBasicInfo = async () => {
const params = { const params = {
......
src/views/exportControl/index.vue
浏览文件 @ 664303a2
...@@ -2,7 +2,12 @@ ...@@ -2,7 +2,12 @@
<div class="home-wrapper"> <div class="home-wrapper">
<div class="search-header" v-show="isShow"> <div class="search-header" v-show="isShow">
<div class="home-main-header-center"> <div class="home-main-header-center">
<el-input v-model="searchExportControlText" style="width: 800px; height: 100%" placeholder="搜索出口管制" /> <el-input
v-model="searchExportControlText"
@keyup.enter="handleSearch"
style="width: 800px; height: 100%"
placeholder="搜索出口管制"
/>
<div class="search"> <div class="search">
<div class="search-icon"> <div class="search-icon">
<img src="@/assets/icons/search-icon.png" alt="" /> <img src="@/assets/icons/search-icon.png" alt="" />
...@@ -408,7 +413,7 @@ ...@@ -408,7 +413,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20" style="width: 1600px; margin: 0 auto; margin-top: 39px;"> <el-row :gutter="20" style="width: 1600px; margin: 0 auto; margin-top: 39px">
<CustomTitle id="position4" title="资源库" style="margin-top: 0px" /> <CustomTitle id="position4" title="资源库" style="margin-top: 0px" />
<div class="resource-tabs"> <div class="resource-tabs">
<div <div
...@@ -3389,6 +3394,7 @@ const handleMediaClick = item => { ...@@ -3389,6 +3394,7 @@ const handleMediaClick = item => {
height: 144px; height: 144px;
background: #fff; background: #fff;
overflow: hidden; overflow: hidden;
box-shadow: 0px 0px 20px 0px rgba(25, 69, 130, 0.3);
.home-main-header-center { .home-main-header-center {
margin-top: 20px; margin-top: 20px;
margin-left: 200px; margin-left: 200px;
......
src/views/thinkTank/index.vue
浏览文件 @ 664303a2
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
<headerInfo curTitleName="科技智库"></headerInfo> <headerInfo curTitleName="科技智库"></headerInfo>
</div> </div>
</div> --> </div> -->
<div class="home-main-header-center" v-show="!isShow"> <div class="home-main-header-center">
<el-input <el-input
v-model="searchThinktankText" v-model="searchThinktankText"
@keyup.enter="handleSearch" @keyup.enter="handleSearch"
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论