提交 2dda3480 authored 作者: coderBryanFu's avatar coderBryanFu

update

上级 c5add0d2
<template> <template>
<div id="app"> <div id="app">
<el-container class="wrapper"> <div class="wrapper">
<el-header> <div class="navbar">
<nav class="navbar">
<div class="nav-brand"> <div class="nav-brand">
<div class="brand-icon"> <div class="brand-icon">
<img src="@/assets/icons/header-logo.png" alt="" /> <img src="@/assets/icons/header-logo.png" alt="" />
...@@ -20,12 +19,10 @@ ...@@ -20,12 +19,10 @@
</div> </div>
<span class="user">管理员</span> <span class="user">管理员</span>
</div> </div>
</nav> </div>
</el-header> <div class="main-container">
<el-main class="main-container">
<router-view /> <router-view />
</el-main> </div>
<div class="ai-btn" @click="openAiBox"> <div class="ai-btn" @click="openAiBox">
<div class="icon"> <div class="icon">
<img src="@/assets/icons/ai-icon.png" alt="" /> <img src="@/assets/icons/ai-icon.png" alt="" />
...@@ -36,7 +33,7 @@ ...@@ -36,7 +33,7 @@
<div class="ai-dialog" v-if="isShowAiBox"> <div class="ai-dialog" v-if="isShowAiBox">
<AiBox @close="closeAiBox" /> <AiBox @close="closeAiBox" />
</div> </div>
</el-container> </div>
</div> </div>
</template> </template>
...@@ -46,7 +43,7 @@ import { Monitor, House, User, Location, Document, Bell, Message, ArrowDown } fr ...@@ -46,7 +43,7 @@ import { Monitor, House, User, Location, Document, Bell, Message, ArrowDown } fr
import { useRouter } from "vue-router"; import { useRouter } from "vue-router";
import Breadcrumb from "@/components/BreadCrumb/index.vue"; import Breadcrumb from "@/components/BreadCrumb/index.vue";
import AiBox from "./components/AiBox.vue"; import AiBox from "./components/AiBox.vue";
import {getPersonType} from '@/api/common/index' import { getPersonType } from "@/api/common/index";
// import { useDraggable } from "@vueuse/core"; // import { useDraggable } from "@vueuse/core";
const router = useRouter(); const router = useRouter();
...@@ -86,29 +83,25 @@ const handleHomeCommand = command => { ...@@ -86,29 +83,25 @@ const handleHomeCommand = command => {
router.push(command); router.push(command);
}; };
const personTypeList = ref([]) const personTypeList = ref([]);
// 获取人物类别 // 获取人物类别
const handleGetPersonType = async() => { const handleGetPersonType = async () => {
try { try {
const res = await getPersonType() const res = await getPersonType();
console.log('res', res); console.log("res", res);
if(res.code === 200) { if (res.code === 200) {
personTypeList.value = res.data personTypeList.value = res.data;
} else { } else {
personTypeList.value = [] personTypeList.value = [];
}
window.sessionStorage.setItem('personTypeList', JSON.stringify(personTypeList.value))
} catch (error) {
} }
} window.sessionStorage.setItem("personTypeList", JSON.stringify(personTypeList.value));
} catch (error) {}
};
onMounted(() => { onMounted(() => {
handleGetPersonType() handleGetPersonType();
}) });
</script> </script>
<style> <style>
...@@ -141,7 +134,7 @@ body { ...@@ -141,7 +134,7 @@ body {
text-align: justify; text-align: justify;
} }
.el-popper[data-popper-placement^=top]>.el-popper__arrow:before { .el-popper[data-popper-placement^="top"] > .el-popper__arrow:before {
display: none; display: none;
} }
</style> </style>
...@@ -164,20 +157,19 @@ body { ...@@ -164,20 +157,19 @@ body {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
background: white; background: #fff;
color: #333; color: rgba(10, 18, 30, 1);
height: 100%;
border-bottom: 1px solid #e5e7eb; border-bottom: 1px solid #e5e7eb;
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
position: relative; position: relative;
box-sizing: border-box; box-sizing: border-box;
height: 96px; height: 72px;
} }
.main-container { .main-container {
/* 移除宽度限制,让子页面自己控制布局 */ /* 移除宽度限制,让子页面自己控制布局 */
width: 100%; width: 100%;
height: 984px; height: 1008px;
position: relative; position: relative;
} }
...@@ -191,7 +183,6 @@ body { ...@@ -191,7 +183,6 @@ body {
.brand-icon { .brand-icon {
width: 48px; width: 48px;
height: 48px; height: 48px;
img { img {
width: 100%; width: 100%;
height: 100%; height: 100%;
...@@ -309,13 +300,6 @@ body { ...@@ -309,13 +300,6 @@ body {
.wrapper { .wrapper {
position: relative; position: relative;
.target {
// position: absolute;
// bottom: 20%;
// right: 46px;
z-index: 9999;
}
.ai-btn { .ai-btn {
position: absolute; position: absolute;
bottom: 240px; bottom: 240px;
...@@ -344,7 +328,6 @@ body { ...@@ -344,7 +328,6 @@ body {
text-align: center; text-align: center;
} }
} }
.ai-dialog { .ai-dialog {
position: absolute; position: absolute;
right: 100px; right: 100px;
...@@ -353,18 +336,4 @@ body { ...@@ -353,18 +336,4 @@ body {
} }
} }
.el-header {
padding: 0;
height: 96px;
position: relative;
z-index: 1;
}
.el-main {
padding: 0;
height: calc(100vh - 96px);
overflow: hidden;
overflow-y: auto;
background-color: rgba(246, 251, 255, 1);
}
</style> </style>
<template>
<div class="info-wrapper">
<div class="header-item">国家科技安全</div>
<div class="header-item">></div>
<div class="header-item back-item" @click="handleBackHome">中美博弈概览</div>
<div class="header-item">></div>
<div class="header-item">{{ curTitleName }}</div>
</div>
</template>
<script setup>
import { ref, onMounted } from "vue";
import router from "@/router";
const props = defineProps({
curTitleName: {
type: String,
required: true
}
});
// 返回首页
const handleBackHome = () => {
router.push({
path: "/overview"
});
};
</script>
<style lang="scss" scoped>
.info-wrapper {
height: 64px;
line-height: 64px;
display: flex;
justify-content: flex-end;
font-family: Microsoft YaHei;
font-size: 20px;
font-weight: 700;
color: #fff;
.header-item {
margin: 0 3px;
}
.back-item {
cursor: pointer;
&:hover {
color: #ccc;
}
}
}
</style>
\ No newline at end of file
<template>
<div class="menu-wrapper">
<div class="menu-item">
<div class="menu-item-icon">
<img src="@/assets/icons/home-header-icon1.png" alt="" />
</div>
<div class="menu-item-text">{{ "首页" }}</div>
</div>
<div class="menu-item">
<div class="menu-item-icon1">
<img src="@/assets/icons/home-header-icon2.png" alt="" />
</div>
<div class="menu-item-text">{{ "国家" }}</div>
</div>
<div class="menu-item">
<div class="menu-item-icon2">
<img src="@/assets/icons/home-header-icon3.png" alt="" />
</div>
<div class="menu-item-text">{{ "领域" }}</div>
</div>
<div class="menu-item">
<div class="menu-item-icon3">
<img src="@/assets/icons/home-header-icon4.png" alt="" />
</div>
<div class="menu-item-text">{{ "要素" }}</div>
</div>
<div class="menu-item">
<div class="menu-item-icon4">
<img src="@/assets/icons/home-header-icon5.png" alt="" />
</div>
<div class="menu-item-text">{{ "事件" }}</div>
</div>
</div>
</template>
<style lang="scss" scoped>
.menu-wrapper {
width: 644px;
height: 64px;
display: flex;
justify-content: space-between;
.menu-item {
display: flex;
gap: 11px;
width: 112px;
height: 64px;
justify-content: center;
align-items: center;
.menu-item-icon {
// margin-top: 2px;
width: 22px;
height: 22px;
img {
width: 100%;
height: 100%;
}
}
.menu-item-icon1 {
// margin-top: 4px;
width: 24px;
height: 24px;
img {
width: 100%;
height: 100%;
}
}
.menu-item-icon2 {
// margin-top: 4px;
width: 24px;
height: 22px;
img {
width: 100%;
height: 100%;
}
}
.menu-item-icon3 {
// margin-top: 2px;
width: 20px;
height: 20px;
img {
width: 100%;
height: 100%;
}
}
.menu-item-icon4 {
width: 22px;
height: 20px;
img {
width: 100%;
height: 100%;
}
}
.menu-item-text {
// margin-top: 16px;
height: 32px;
color: rgba(255, 255, 255, 1);
font-family: Microsoft YaHei;
font-style: Bold;
font-size: 24px;
font-weight: 700;
line-height: 32px;
letter-spacing: 0px;
text-align: left;
}
}
}
</style>
\ No newline at end of file
...@@ -39,11 +39,12 @@ ...@@ -39,11 +39,12 @@
</div> </div>
<div class="home-box" :class="{ scrollHomeBox: isShow }" ref="containerRef"> <div class="home-box" :class="{ scrollHomeBox: isShow }" ref="containerRef">
<div class="home-header" v-show="!isShow"> <div class="home-header" v-show="!isShow">
<div class="header-item">国家科技安全</div> <div class="header-left">
<div class="header-item">></div> <HeaderMenu></HeaderMenu>
<div class="header-item back-item" @click="handleBackHome">中美博弈概览</div> </div>
<div class="header-item">></div> <div class="header-right">
<div class="header-item">科技法案</div> <headerInfo curTitleName="科技法案"></headerInfo>
</div>
</div> </div>
<div class="home-main"> <div class="home-main">
<div class="home-main-header" v-show="!isShow"> <div class="home-main-header" v-show="!isShow">
...@@ -198,12 +199,12 @@ ...@@ -198,12 +199,12 @@
<div class="inner-box-title"> <div class="inner-box-title">
{{ bill.news?.newsTitle }} {{ bill.news?.newsTitle }}
</div> </div>
<div class="inner-box-time">{{ bill.news?.newsTime.replace('T', ' ') }}</div> <div class="inner-box-time">
{{ bill.news?.newsTime.replace("T", " ") }}
</div>
</div> </div>
<div class="inner-box-content"> <div class="inner-box-content">
{{ {{ bill.news?.newsContent }}
bill.news?.newsContent
}}
</div> </div>
</div> </div>
</div> </div>
...@@ -223,7 +224,12 @@ ...@@ -223,7 +224,12 @@
</div> </div>
</div> </div>
<div class="box2-main"> <div class="box2-main">
<div class="box2-main-item" v-for="(item, index) in warningList" :key="index" @click="handleClickToDetailO(item)"> <div
class="box2-main-item"
v-for="(item, index) in warningList"
:key="index"
@click="handleClickToDetailO(item)"
>
<div <div
class="item-left" class="item-left"
:class="{ :class="{
...@@ -350,7 +356,6 @@ ...@@ -350,7 +356,6 @@
</el-select> </el-select>
</div> </div>
</div> </div>
</div> </div>
<div <div
...@@ -755,7 +760,8 @@ ...@@ -755,7 +760,8 @@
import { onMounted, ref, computed, onUnmounted, nextTick, watch } from "vue"; import { onMounted, ref, computed, onUnmounted, nextTick, watch } from "vue";
import router from "@/router/index"; import router from "@/router/index";
import setChart from "@/utils/setChart"; import setChart from "@/utils/setChart";
import HeaderMenu from "@/components/headerMenu.vue";
import headerInfo from "@/components/headerInfo.vue";
import { import {
getBillIndustry, getBillIndustry,
getHotBills, getHotBills,
...@@ -840,7 +846,7 @@ const formatMessageTime = timeStr => { ...@@ -840,7 +846,7 @@ const formatMessageTime = timeStr => {
}; };
// 跳转人物主页 // 跳转人物主页
const handleClcikToCharacter = async (id) => { const handleClcikToCharacter = async id => {
const personTypeList = JSON.parse(window.sessionStorage.getItem("personTypeList")); const personTypeList = JSON.parse(window.sessionStorage.getItem("personTypeList"));
let type = 0; let type = 0;
...@@ -943,16 +949,12 @@ const curBill = ref({ ...@@ -943,16 +949,12 @@ const curBill = ref({
// 查看详情 // 查看详情
const handleClickToDetail = () => { const handleClickToDetail = () => {
window.sessionStorage.setItem("billId", curBill.value.billId); window.sessionStorage.setItem("billId", curBill.value.billId);
const route = router.resolve( const route = router.resolve({
{
path: "/billLayout", path: "/billLayout",
query: { query: {
billId: curBill.value.billId, billId: curBill.value.billId
},
} }
});
);
console.log(route); console.log(route);
window.open(route.href, "_blank"); window.open(route.href, "_blank");
...@@ -990,7 +992,6 @@ const handleToMoreNews = () => { ...@@ -990,7 +992,6 @@ const handleToMoreNews = () => {
// 风险信号 // 风险信号
const warningList = ref([]); const warningList = ref([]);
const box7selectetedTime = ref("2025"); const box7selectetedTime = ref("2025");
const box7YearList = ref([ const box7YearList = ref([
{ {
...@@ -1848,25 +1849,11 @@ onUnmounted(() => {}); ...@@ -1848,25 +1849,11 @@ onUnmounted(() => {});
overflow-y: auto; overflow-y: auto;
.home-header { .home-header {
height: 64px; height: 64px;
color: #fff;
font-family: Microsoft YaHei;
font-size: 20px;
font-weight: 700;
line-height: 26px;
line-height: 64px;
background: url("./assets/images/header-bg.png"); background: url("./assets/images/header-bg.png");
box-sizing: border-box; box-sizing: border-box;
padding-left: 160px; padding: 0 160px;
display: flex; display: flex;
.header-item { justify-content: space-between;
margin: 0 3px;
}
.back-item {
cursor: pointer;
&:hover {
color: #ccc;
}
}
} }
.home-main { .home-main {
width: 1600px; width: 1600px;
......
...@@ -41,12 +41,11 @@ ...@@ -41,12 +41,11 @@
<!-- 面包屑 --> <!-- 面包屑 -->
<div class="breadcrumb" v-show="!isShow"> <div class="breadcrumb" v-show="!isShow">
<div class="breadcrumb-box"> <div class="header-left">
<div class="breadcrumb-item">国家科技安全</div> <HeaderMenu></HeaderMenu>
<div class="breadcrumb-item">&nbsp;>&nbsp;</div> </div>
<div class="breadcrumb-item back-item" @click="handleBackHome">中美博弈概览</div> <div class="header-right">
<div class="breadcrumb-item">&nbsp;>&nbsp;</div> <headerInfo curTitleName="合作限制"></headerInfo>
<div class="breadcrumb-item">合作限制</div>
</div> </div>
</div> </div>
<!-- 主页面 --> <!-- 主页面 -->
...@@ -136,6 +135,8 @@ ...@@ -136,6 +135,8 @@
<script setup> <script setup>
import { ref, onMounted, nextTick } from "vue"; import { ref, onMounted, nextTick } from "vue";
import { useRouter } from "vue-router"; import { useRouter } from "vue-router";
import HeaderMenu from "@/components/headerMenu.vue";
import headerInfo from "@/components/headerInfo.vue";
import comTitle from "./common/comTitle.vue"; import comTitle from "./common/comTitle.vue";
import newData from "./components/dataNew/index.vue"; import newData from "./components/dataNew/index.vue";
import askPage from "./components/askPage/index.vue"; import askPage from "./components/askPage/index.vue";
...@@ -201,25 +202,9 @@ const handleBackHome = () => { ...@@ -201,25 +202,9 @@ const handleBackHome = () => {
height: 64px; height: 64px;
background-image: url("./assets/images/bread-bg.png"); background-image: url("./assets/images/bread-bg.png");
background-size: cover; background-size: cover;
padding: 17px 0px 21px 0px; padding: 0 160px;
.breadcrumb-box {
margin-left: 160px;
display: flex; display: flex;
// align-items: center; justify-content: space-between;
.breadcrumb-item {
font-size: 20px;
font-weight: 700;
font-family: "Microsoft YaHei";
line-height: 30px;
color: #fff;
}
.back-item {
cursor: pointer;
&:hover {
color: #999;
}
}
}
} }
.main-content { .main-content {
position: relative; position: relative;
......
...@@ -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="searchDecreeText" @keyup.enter="handleSearch" style="width: 680px; height: 100%" placeholder="搜索科技政令" /> <el-input
v-model="searchDecreeText"
@keyup.enter="handleSearch"
style="width: 680px; height: 100%"
placeholder="搜索科技政令"
/>
<div class="search"> <div class="search">
<div class="search-icon"> <div class="search-icon">
<img src="./assets/images/search-icon.png" alt="" /> <img src="./assets/images/search-icon.png" alt="" />
...@@ -40,14 +45,20 @@ ...@@ -40,14 +45,20 @@
<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-top" v-show="!isShow">
<div class="header-item">国家科技安全</div> <div class="header-left">
<div class="header-item">></div> <HeaderMenu></HeaderMenu>
<div class="header-item back-item" @click="handleBackHome">中美博弈概览</div> </div>
<div class="header-item">></div> <div class="header-right">
<div class="header-item">行政令</div> <headerInfo curTitleName="行政令"></headerInfo>
</div>
</div> </div>
<div class="home-main-header-center" v-show="!isShow"> <div class="home-main-header-center" v-show="!isShow">
<el-input v-model="searchDecreeText" @keyup.enter="handleSearch" style="width: 838px; height: 100%" placeholder="搜索科技政令" /> <el-input
v-model="searchDecreeText"
@keyup.enter="handleSearch"
style="width: 838px; height: 100%"
placeholder="搜索科技政令"
/>
<div class="search"> <div class="search">
<div class="search-icon"> <div class="search-icon">
<img src="./assets/images/search-icon.png" alt="" /> <img src="./assets/images/search-icon.png" alt="" />
...@@ -539,8 +550,9 @@ ...@@ -539,8 +550,9 @@
<script setup> <script setup>
import { onMounted, ref, computed, watch } from "vue"; import { onMounted, ref, computed, watch } from "vue";
import * as echarts from "echarts";
import router from "@/router"; import router from "@/router";
import HeaderMenu from "@/components/headerMenu.vue";
import headerInfo from "@/components/headerInfo.vue";
import { import {
getDepartmentList, getDepartmentList,
getLatestDecree, getLatestDecree,
...@@ -763,7 +775,6 @@ const warningList = ref([ ...@@ -763,7 +775,6 @@ const warningList = ref([
// postDate: "一天前", // postDate: "一天前",
// riskLevel: "特别重大" // riskLevel: "特别重大"
// } // }
]); ]);
const handlegetDecreeRiskSignal = async () => { const handlegetDecreeRiskSignal = async () => {
try { try {
...@@ -1164,7 +1175,7 @@ const pubTime = ref([ ...@@ -1164,7 +1175,7 @@ const pubTime = ref([
{ id: "2023", name: "2023年" }, { id: "2023", name: "2023年" },
{ id: "2022", name: "2022年" }, { id: "2022", name: "2022年" },
{ id: "2021", name: "2021年" }, { id: "2021", name: "2021年" },
{ id: "2020", name: "2020年" }, { id: "2020", name: "2020年" }
// { id: "更早时间", name: "更早时间" } // { id: "更早时间", name: "更早时间" }
]); ]);
const activePubTime = ref(["2025"]); const activePubTime = ref(["2025"]);
...@@ -1213,7 +1224,7 @@ const handleGetDecreeOrderList = async () => { ...@@ -1213,7 +1224,7 @@ const handleGetDecreeOrderList = async () => {
return { return {
id: item.id, id: item.id,
time: item.postDate, time: item.postDate,
title: item.proposeOrgName+ ': '+ item.name, title: item.proposeOrgName + ": " + item.name,
desc: item.describe, desc: item.describe,
img: item.orgImage, img: item.orgImage,
tagList: item.industryList tagList: item.industryList
...@@ -1274,18 +1285,17 @@ const handleSwithCurDecree = name => { ...@@ -1274,18 +1285,17 @@ const handleSwithCurDecree = name => {
}; };
// 搜索 // 搜索
const searchDecreeText = ref('') const searchDecreeText = ref("");
const handleSearch = () => { const handleSearch = () => {
const curRoute = router.resolve({ const curRoute = router.resolve({
path: "/searchResults", path: "/searchResults",
query: { query: {
searchText: searchDecreeText.value, searchText: searchDecreeText.value,
areaName: '政令' areaName: "政令"
} }
}); });
window.open(curRoute.href, "_blank"); window.open(curRoute.href, "_blank");
};
}
onMounted(async () => { onMounted(async () => {
handleGetAreaList(); handleGetAreaList();
...@@ -1419,28 +1429,11 @@ onMounted(async () => { ...@@ -1419,28 +1429,11 @@ onMounted(async () => {
.home-main-header-top { .home-main-header-top {
width: 100%; width: 100%;
height: 64px; height: 64px;
color: rgba(95, 101, 108, 1);
font-family: Microsoft YaHei;
font-size: 16px;
font-weight: 400;
line-height: 64px;
background: url("./assets/images/header-bg.png"); background: url("./assets/images/header-bg.png");
font-family: Microsoft YaHei;
font-size: 20px;
font-weight: 700;
color: #fff;
box-sizing: border-box; box-sizing: border-box;
padding-left: 160px;
display: flex; display: flex;
.header-item { justify-content: space-between;
margin: 0 3px; padding: 0 160px;
}
.back-item {
cursor: pointer;
&:hover {
color: #ccc;
}
}
} }
.home-main-header-center { .home-main-header-center {
margin-top: 48px; margin-top: 48px;
......
<template> <template>
<div class="home-wrapper"> <div class="home-wrapper">
<div class="home-header"> <div class="home-header">
<div class="header-item">国家科技安全</div> <div class="header-left">
<div class="header-item">></div> <HeaderMenu></HeaderMenu>
<div class="header-item back-item" @click="handleBackHome">中美博弈概览</div> </div>
<div class="header-item">></div> <div class="header-right">
<div class="header-item">投融资限制</div> <headerInfo curTitleName="投融资限制"></headerInfo>
</div>
</div> </div>
<div class="home-main"> <div class="home-main">
<div class="home-main-header"> <div class="home-main-header">
...@@ -145,11 +146,7 @@ ...@@ -145,11 +146,7 @@
<custom-container titleType="danger" title="风险信号" :titleIcon="dangerIcon" height="450px"> <custom-container titleType="danger" title="风险信号" :titleIcon="dangerIcon" height="450px">
<template #default> <template #default>
<div class="box2-main"> <div class="box2-main">
<div <div class="box2-main-item" v-for="(item, index) in warningList" :key="index">
class="box2-main-item"
v-for="(item, index) in warningList"
:key="index"
>
<div <div
class="item-left" class="item-left"
:class="{ :class="{
...@@ -517,6 +514,8 @@ ...@@ -517,6 +514,8 @@
<script setup> <script setup>
import { onMounted, ref, computed } from "vue"; import { onMounted, ref, computed } from "vue";
import scrollToTop from "@/utils/scrollToTop"; import scrollToTop from "@/utils/scrollToTop";
import HeaderMenu from "@/components/headerMenu.vue";
import headerInfo from "@/components/headerInfo.vue";
import setChart from "@/utils/setChart"; import setChart from "@/utils/setChart";
import * as echarts from "echarts"; import * as echarts from "echarts";
import { DArrowRight, Warning, Search } from "@element-plus/icons-vue"; import { DArrowRight, Warning, Search } from "@element-plus/icons-vue";
...@@ -1317,25 +1316,12 @@ onMounted(async () => { ...@@ -1317,25 +1316,12 @@ onMounted(async () => {
.home-header { .home-header {
height: 64px; height: 64px;
color: #fff;
font-family: Microsoft YaHei;
font-size: 20px;
font-weight: 700;
line-height: 26px;
line-height: 64px;
background: url("@/assets/images/nav-bg.png"); background: url("@/assets/images/nav-bg.png");
box-sizing: border-box; box-sizing: border-box;
padding-left: 160px; padding-left: 160px;
display: flex; display: flex;
.header-item { justify-content: space-between;
margin: 0 3px; padding: 0 160px;
}
.back-item {
cursor: pointer;
&:hover {
color: #ccc;
}
}
} }
.box1 { .box1 {
......
...@@ -41,11 +41,12 @@ ...@@ -41,11 +41,12 @@
<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-top" v-show="!isShow">
<div class="header-item">国家科技安全</div> <div class="header-left">
<div class="header-item">></div> <HeaderMenu></HeaderMenu>
<div class="header-item back-item" @click="handleBackHome">中美博弈概览</div> </div>
<div class="header-item">></div> <div class="header-right">
<div class="header-item">主要创新主体</div> <headerInfo curTitleName="主要创新主体"></headerInfo>
</div>
</div> </div>
<div class="home-main-header-center" v-show="!isShow"> <div class="home-main-header-center" v-show="!isShow">
<el-input v-model="input" style="width: 838px; height: 100%" placeholder="搜索创新主体" /> <el-input v-model="input" style="width: 838px; height: 100%" placeholder="搜索创新主体" />
...@@ -403,6 +404,8 @@ ...@@ -403,6 +404,8 @@
import { onMounted, ref, computed } from "vue"; import { onMounted, ref, computed } from "vue";
import * as echarts from "echarts"; import * as echarts from "echarts";
import router from "@/router"; import router from "@/router";
import HeaderMenu from "@/components/headerMenu.vue";
import headerInfo from "@/components/headerInfo.vue";
import DivideHeader from "@/components/DivideHeader.vue"; import DivideHeader from "@/components/DivideHeader.vue";
import scrollToTop from "@/utils/scrollToTop"; import scrollToTop from "@/utils/scrollToTop";
import { useContainerScroll } from "@/hooks/useScrollShow"; import { useContainerScroll } from "@/hooks/useScrollShow";
...@@ -1193,31 +1196,12 @@ onMounted(async () => { ...@@ -1193,31 +1196,12 @@ onMounted(async () => {
.home-main-header-top { .home-main-header-top {
width: 100%; width: 100%;
height: 64px; height: 64px;
color: rgba(95, 101, 108, 1);
font-family: Microsoft YaHei;
font-size: 16px;
font-weight: 400;
line-height: 64px;
background: url("./assets/images/header-bg.png"); background: url("./assets/images/header-bg.png");
font-family: Microsoft YaHei;
font-size: 20px;
font-weight: 700;
color: #fff;
box-sizing: border-box; box-sizing: border-box;
padding-left: 160px; padding: 0 160px;
display: flex; display: flex;
justify-content: space-between;
.header-item {
margin: 0 3px;
}
.back-item {
cursor: pointer;
&:hover {
color: #ccc;
}
}
} }
.home-main-header-center { .home-main-header-center {
......
...@@ -3,13 +3,12 @@ ...@@ -3,13 +3,12 @@
<div class="home-main"> <div class="home-main">
<div class="home-main-header"> <div class="home-main-header">
<div class="home-main-header-top"> <div class="home-main-header-top">
<!-- <span>国家科技安全 </span>> <span>中美博弈概览 </span>> <div class="header-left">
<span>市场准入限制</span> --> <HeaderMenu></HeaderMenu>
<div class="header-item">国家科技安全</div> </div>
<div class="header-item">></div> <div class="header-right">
<div class="header-item back-item" @click="handleBackHome">中美博弈概览</div> <headerInfo curTitleName="市场准入限制"></headerInfo>
<div class="header-item">></div> </div>
<div class="header-item">市场准入限制</div>
</div> </div>
<div class="home-main-header-center"> <div class="home-main-header-center">
<el-input v-model="input" style="width: 838px; height: 100%" placeholder="搜索市场准入限制调查" /> <el-input v-model="input" style="width: 838px; height: 100%" placeholder="搜索市场准入限制调查" />
...@@ -611,6 +610,8 @@ import setChart from "@/utils/setChart"; ...@@ -611,6 +610,8 @@ import setChart from "@/utils/setChart";
import scrollToTop from "@/utils/scrollToTop"; import scrollToTop from "@/utils/scrollToTop";
import router from "@/router"; import router from "@/router";
import DivideHeader from "@/components/DivideHeader.vue"; import DivideHeader from "@/components/DivideHeader.vue";
import HeaderMenu from "@/components/headerMenu.vue";
import headerInfo from "@/components/headerInfo.vue";
import getMultiLineChart from "./utils/multiLineChart"; import getMultiLineChart from "./utils/multiLineChart";
import getPieChart from "./utils/piechart"; import getPieChart from "./utils/piechart";
...@@ -1525,27 +1526,10 @@ onMounted(async () => { ...@@ -1525,27 +1526,10 @@ onMounted(async () => {
box-sizing: border-box; box-sizing: border-box;
width: 100%; width: 100%;
height: 64px; height: 64px;
color: rgba(95, 101, 108, 1);
font-family: Microsoft YaHei;
font-size: 16px;
font-weight: 400;
line-height: 64px;
background: url("./assets/images/header-bg.png"); background: url("./assets/images/header-bg.png");
font-family: Microsoft YaHei; padding: 0 160px;
font-size: 20px;
font-weight: 700;
color: #fff;
padding-left: 160px;
display: flex; display: flex;
.header-item { justify-content: space-between;
margin: 0 3px;
}
.back-item {
cursor: pointer;
&:hover {
color: #ccc;
}
}
} }
.home-main-header-center { .home-main-header-center {
margin-top: 48px; margin-top: 48px;
......
...@@ -41,12 +41,11 @@ ...@@ -41,12 +41,11 @@
<!-- 面包屑 --> <!-- 面包屑 -->
<div class="breadcrumb" v-show="!isShow"> <div class="breadcrumb" v-show="!isShow">
<div class="breadcrumb-box"> <div class="header-left">
<div class="breadcrumb-item">国家科技安全</div> <HeaderMenu></HeaderMenu>
<div class="breadcrumb-item">&nbsp;>&nbsp;</div> </div>
<div class="breadcrumb-item back-item" @click="handleBackHome">中美博弈概览</div> <div class="header-right">
<div class="breadcrumb-item">&nbsp;>&nbsp;</div> <headerInfo curTitleName="规则限制"></headerInfo>
<div class="breadcrumb-item">规则限制</div>
</div> </div>
</div> </div>
<!-- 主页面 --> <!-- 主页面 -->
...@@ -145,7 +144,8 @@ import newData from "./components/dataNew/index.vue"; ...@@ -145,7 +144,8 @@ import newData from "./components/dataNew/index.vue";
import askPage from "./components/askPage/index.vue"; import askPage from "./components/askPage/index.vue";
import dataSub from "./components/dataSub/index.vue"; import dataSub from "./components/dataSub/index.vue";
import resLib from "./components/resLib/index.vue"; import resLib from "./components/resLib/index.vue";
import HeaderMenu from "@/components/headerMenu.vue";
import headerInfo from "@/components/headerInfo.vue";
import { useContainerScroll } from "@/hooks/useScrollShow"; import { useContainerScroll } from "@/hooks/useScrollShow";
// 搜索框 // 搜索框
...@@ -205,25 +205,9 @@ const handleBackHome = () => { ...@@ -205,25 +205,9 @@ const handleBackHome = () => {
height: 64px; height: 64px;
background-image: url("./assets/images/bread-bg.png"); background-image: url("./assets/images/bread-bg.png");
background-size: cover; background-size: cover;
padding: 17px 0px 21px 0px;
.breadcrumb-box {
margin-left: 160px;
display: flex; display: flex;
// align-items: center; justify-content: space-between;
.breadcrumb-item { padding: 0 160px;
font-size: 20px;
font-weight: 700;
font-family: "Microsoft YaHei";
line-height: 30px;
color: #fff;
}
.back-item {
cursor: pointer;
&:hover {
color: #999;
}
}
}
} }
.main-content { .main-content {
position: relative; position: relative;
......
...@@ -2,12 +2,11 @@ ...@@ -2,12 +2,11 @@
<div class="coop-page"> <div class="coop-page">
<!-- 面包屑 --> <!-- 面包屑 -->
<div class="breadcrumb"> <div class="breadcrumb">
<div class="breadcrumb-box"> <div class="header-left">
<div class="breadcrumb-item">国家科技安全</div> <HeaderMenu></HeaderMenu>
<div class="breadcrumb-item">&nbsp;>&nbsp;</div> </div>
<div class="breadcrumb-item back-item" @click="handleBackHome">中美博弈概览</div> <div class="header-right">
<div class="breadcrumb-item">&nbsp;>&nbsp;</div> <headerInfo curTitleName="科研资助体系"></headerInfo>
<div class="breadcrumb-item">科研资助体系</div>
</div> </div>
</div> </div>
<!-- 主页面 --> <!-- 主页面 -->
...@@ -116,7 +115,8 @@ import newData from "./components/dataNew/index.vue"; ...@@ -116,7 +115,8 @@ import newData from "./components/dataNew/index.vue";
import askPage from "./components/askPage/index.vue"; import askPage from "./components/askPage/index.vue";
import dataSub from "./components/dataSub/index.vue"; import dataSub from "./components/dataSub/index.vue";
import resLib from "./components/resLib/index.vue"; import resLib from "./components/resLib/index.vue";
import HeaderMenu from "@/components/headerMenu.vue";
import headerInfo from "@/components/headerInfo.vue";
import scrollToTop from "@/utils/scrollToTop"; import scrollToTop from "@/utils/scrollToTop";
import { useContainerScroll } from "@/hooks/useScrollShow"; import { useContainerScroll } from "@/hooks/useScrollShow";
...@@ -210,25 +210,9 @@ const dataList = ref([ ...@@ -210,25 +210,9 @@ const dataList = ref([
height: 64px; height: 64px;
background-image: url("./assets/images/bread-bg.png"); background-image: url("./assets/images/bread-bg.png");
background-size: cover; background-size: cover;
padding: 17px 0px 21px 0px;
.breadcrumb-box {
margin-left: 160px;
display: flex; display: flex;
// align-items: center; justify-content: space-between;
.breadcrumb-item { padding: 0 160px;
font-size: 20px;
font-weight: 700;
font-family: "Microsoft YaHei";
line-height: 30px;
color: #fff;
}
.back-item {
cursor: pointer;
&:hover {
color: #999;
}
}
}
} }
.main-content { .main-content {
overflow: auto; overflow: auto;
......
...@@ -3,11 +3,12 @@ ...@@ -3,11 +3,12 @@
<div class="home-main"> <div class="home-main">
<div class="home-main-header"> <div class="home-main-header">
<div class="home-main-header-top"> <div class="home-main-header-top">
<div class="header-item">国家科技安全</div> <div class="header-left">
<div class="header-item">></div> <HeaderMenu></HeaderMenu>
<div class="header-item back-item" @click="handleBackHome">中美博弈概览</div> </div>
<div class="header-item">></div> <div class="header-right">
<div class="header-item">科技人物观点</div> <headerInfo curTitleName="科技人物观点"></headerInfo>
</div>
</div> </div>
<div class="home-main-header-center"> <div class="home-main-header-center">
<el-input v-model="input" style="width: 838px; height: 100%" placeholder="搜索科技人物及观点" /> <el-input v-model="input" style="width: 838px; height: 100%" placeholder="搜索科技人物及观点" />
...@@ -324,7 +325,8 @@ import { useRouter } from "vue-router"; ...@@ -324,7 +325,8 @@ import { useRouter } from "vue-router";
import scrollToTop from "@/utils/scrollToTop"; import scrollToTop from "@/utils/scrollToTop";
import DivideHeader from "@/components/DivideHeader.vue"; import DivideHeader from "@/components/DivideHeader.vue";
import setChart from "@/utils/setChart"; import setChart from "@/utils/setChart";
import HeaderMenu from "@/components/headerMenu.vue";
import headerInfo from "@/components/headerInfo.vue";
// 图表工具函数(仅保留用到的) // 图表工具函数(仅保留用到的)
import getWordCloudChart from "./utils/worldCloudChart"; import getWordCloudChart from "./utils/worldCloudChart";
import getMultiLineChart from "./utils/multiLineChart"; import getMultiLineChart from "./utils/multiLineChart";
...@@ -506,30 +508,10 @@ onMounted(() => { ...@@ -506,30 +508,10 @@ onMounted(() => {
box-sizing: border-box; box-sizing: border-box;
width: 100%; width: 100%;
height: 64px; height: 64px;
color: rgba(95, 101, 108, 1);
font-family: Microsoft YaHei;
font-size: 16px;
font-weight: 400;
line-height: 64px;
background: url("./assets/images/header-bg.png"); background: url("./assets/images/header-bg.png");
font-family: Microsoft YaHei; padding: 0 160px;
font-size: 20px;
font-weight: 700;
color: #fff;
padding-left: 160px;
display: flex; display: flex;
justify-content: space-between;
.header-item {
margin: 0 3px;
}
.back-item {
cursor: pointer;
&:hover {
color: #ccc;
}
}
} }
.home-main-header-center { .home-main-header-center {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论