提交 54c6751a authored 作者: coderBryanFu's avatar coderBryanFu

update

上级 fd527c8e
{
"name": "think-tank",
"name": "zm-system",
"version": "1.0.0",
"description": "Vue3 + Element Plus + Vue Router 项目",
"main": "index.js",
......
......@@ -145,7 +145,7 @@ body {
}
.pro-wrapper {
width: 100vw;
width: 1920px;
height: 100vh;
position: relative;
overflow: hidden;
......
......@@ -97,9 +97,6 @@ export function getSearchResult(params) {
})
}
// 资源库
// 左侧行业领域列表
export function getHylyList() {
......@@ -110,21 +107,21 @@ export function getHylyList() {
}
// 左侧发布机构
export function getSearchAOMeasures(params) {
export function getSearchAllOrg(params) {
return request({
method: 'GET',
url: `/api/marketsearchDetails/getSearchAOMeasures`,
url: `/api/marketsearchDetails/getSearchAllOrg`,
params
})
}
// // 左侧受调查国家/地区
// export function getSearchAOMeasures() {
// return request({
// method: 'GET',
// url: `/api/marketsearchDetails/getSearchAOMeasures`,
// })
// }
// 左侧受调查国家/地区
export function getSearchAllCountry() {
return request({
method: 'GET',
url: `/api/marketsearchDetails/getSearchAllCountry`,
})
}
// 获取调查列表接口
/**
......
......@@ -501,11 +501,11 @@ onMounted(() => {
}
.background-wrap-left {
width: 1150px;
width: 1064px;
margin-top: 16px;
.background-wrap-left-box1 {
width: 1150px;
width: 1064px;
height: 415px;
background: #fff;
border-radius: 10px;
......@@ -513,7 +513,7 @@ onMounted(() => {
.box1-main {
.box1-main-center {
margin: 0 22px;
width: 1106px;
width: 1016px;
height: 280px;
display: flex;
flex-wrap: wrap;
......@@ -521,7 +521,7 @@ onMounted(() => {
align-content: flex-start;
.box1-main-item {
width: 544px;
width: 500px;
height: 48px;
box-sizing: border-box;
border: 1px solid rgba(243, 243, 244, 1);
......@@ -592,26 +592,25 @@ onMounted(() => {
.background-wrap-left-box2 {
margin-top: 15px;
width: 1150px;
width: 1064px;
height: 415px;
background: #fff;
border-radius: 10px;
box-shadow: 0px 0px 20px 0px rgba(25, 69, 130, 0.1);
.box2-main {
// margin-top: 9px;
width: 1110px;
width: 1010px;
margin-left: 23px;
height: 349px;
overflow-y: auto;
.box2-main-item {
width: 1103px;
width: 1005px;
height: 60px;
border-radius: 2px;
box-sizing: border-box;
padding: 6px 8px;
display: flex;
&:hover {
background: rgba(225, 225, 225, 0.3);
}
......@@ -629,7 +628,7 @@ onMounted(() => {
.center {
margin-left: 14px;
width: 900px;
width: 805px;
.title {
height: 22px;
......@@ -698,7 +697,7 @@ onMounted(() => {
margin-right: 18px;
margin-left: 16px;
margin-top: 16px;
width: 576px;
width: 520px;
height: 845px;
background: #fff;
border-radius: 10px;
......@@ -741,7 +740,7 @@ onMounted(() => {
.right-box1-main-top {
margin-left: 16px;
width: 544px;
width: 490px;
display: flex;
justify-content: space-between;
......@@ -830,7 +829,7 @@ onMounted(() => {
margin: 17px 16px 0 16px;
border-top: 1px solid rgba(243, 243, 244, 1);
border-bottom: 1px solid rgba(243, 243, 244, 1);
width: 544px;
width: 490px;
height: 266px;
background: rgba(249, 250, 252, 1);
border-radius: 5px;
......@@ -963,7 +962,7 @@ onMounted(() => {
.user-box {
cursor: pointer;
width: 538px;
width: 490px;
padding: 12px 0;
box-sizing: border-box;
border-bottom: 1px solid rgba(241, 243, 246, 1);
......
......@@ -751,7 +751,7 @@
</div>
<div class="right-footer">
<div class="footer-left">
{{ `共 ${total} 条法案` }}
{{ `共 ${total} ` }}
</div>
<div class="footer-right">
<el-pagination
......
......@@ -257,7 +257,7 @@ onMounted(() => {
// margin: 0 auto;
.layout-main {
width: 100%;
height: calc(100vh - 64px);
height: calc(100vh - 72px);
overflow-y: auto;
.header-main {
position: sticky;
......@@ -524,9 +524,9 @@ onMounted(() => {
}
.layout-main-center {
// height: calc(100% - 137px);
width: 1744px;
width: 1600px;
margin: 0 auto;
padding-bottom: 100px;
padding-bottom: 20px;
}
}
.layout-report-box {
......
......@@ -50,7 +50,7 @@
</div>
</div>
<div class="footer-box">
<div class="left">{{ `共${companyList.length}家企业` }}</div>
<div class="left">{{ `共${companyList.length}` }}</div>
<div class="right">
<el-pagination
@current-change="handleCurrentChange"
......
......@@ -506,9 +506,10 @@ onMounted(() => {
}
}
.introduction-wrap-left {
width: 1064px;
margin-top: 16px;
.introduction-wrap-left-box1 {
width: 1150px;
width: 1064px;
height: 415px;
background: #fff;
border-radius: 10px;
......@@ -683,7 +684,7 @@ onMounted(() => {
}
.introduction-wrap-left-box2 {
margin-top: 15px;
width: 1150px;
width: 1064px;
height: 415px;
background: #fff;
border-radius: 10px;
......@@ -822,7 +823,7 @@ onMounted(() => {
margin-top: 16px;
margin-left: 16px;
margin-right: 18px;
width: 576px;
width: 520px;
height: 845px;
background: #fff;
border-radius: 10px;
......
......@@ -412,7 +412,7 @@ onMounted(async () => {
}
.left {
margin-top: 16px;
width: 1150px;
width: 1064px;
height: 845px;
border-radius: 10px;
box-shadow: 0px 0px 20px 0px rgba(25, 69, 130, 0.1);
......@@ -441,7 +441,7 @@ onMounted(async () => {
.left-main {
.left-main-item {
margin-left: 22px;
width: 1104px;
width: 1016px;
height: 65px;
box-sizing: border-box;
border-radius: 2px;
......@@ -579,20 +579,21 @@ onMounted(async () => {
}
}
.right {
width: 520px;
margin-top: 16px;
margin-left: 16px;
.right-box1 {
width: 576px;
width: 520px;
height: 415px;
border-radius: 10px;
box-shadow: 0px 0px 20px 0px rgba(25, 69, 130, 0.1);
background: rgba(255, 255, 255, 1);
.right-box1-main {
width: 576px;
width: 520px;
height: 310px;
}
.right-box1-footer {
width: 549px;
width: 493px;
height: 40px;
display: flex;
border: 1px solid rgba(231, 241, 255, 1);
......@@ -612,13 +613,14 @@ onMounted(async () => {
.right-box1-footer-center {
margin-left: 13px;
margin-top: 8px;
width: 456px;
width: 400px;
height: 24px;
color: var(--color-main-active);
font-family: Microsoft YaHei;
font-size: 14px;
font-weight: 400;
line-height: 24px;
overflow: hidden;
}
.right-box1-footer-right {
margin-left: 13px;
......@@ -639,17 +641,17 @@ onMounted(async () => {
}
.right-box2 {
margin-top: 15px;
width: 576px;
width: 520px;
height: 415px;
border-radius: 10px;
box-shadow: 0px 0px 20px 0px rgba(25, 69, 130, 0.1);
background: rgba(255, 255, 255, 1);
.right-box2-main {
width: 576px;
width: 520px;
height: 310px;
}
.right-box2-footer {
width: 549px;
width: 493px;
height: 40px;
display: flex;
border: 1px solid rgba(231, 241, 255, 1);
......@@ -669,7 +671,7 @@ onMounted(async () => {
.right-box2-footer-center {
margin-left: 13px;
margin-top: 8px;
width: 456px;
width: 400px;
height: 24px;
color: var(--color-main-active);
font-family: Microsoft YaHei;
......
......@@ -598,32 +598,32 @@
:key="index"
@click="handleClickToSurveyDetail()"
>
<div class="item-left">{{ "2025年11月12日" }}</div>
<div class="item-left">{{ item.SEARCHDATE }}</div>
<div class="item-center">
<div class="icon">
<!-- <img :src="item.img" alt="" /> -->
<img :src='item.SORTIMAGEURL' alt="" />
</div>
<div class="line" v-if="index !== surveyInfoList.length - 1"></div>
</div>
<div class="item-right">
<div class="item-right-header">
<div class="tag tag1">{{ "337" }}</div>
<div class="title">{{ item.title }}</div>
<div class="title">{{ item.SEARCHNAME }}</div>
<div class="status">
<div class="status-icon"></div>
<div class="status-text">{{ item.status }}</div>
<div class="status-text">{{ item.CASESTATUS }}</div>
</div>
</div>
<div class="item-right-content">
{{ item.content }}
</div>
<div class="item-right-footer">
<div class="area-box" v-for="(val, idx) in item.areaList" :key="idx">
<div class="area-box" v-for="(val, idx) in item.searchArea" :key="idx">
<div class="area">{{ val }}</div>
</div>
<div class="flag-box">
<div class="flag" v-for="(vall, idxx) in item.countryList" :key="idxx">
<!-- <img src="" alt="" /> -->
<div class="flag" v-for="(vall, idxx) in item.countryImage" :key="idxx">
<img :src="vall" alt="" />
</div>
</div>
</div>
......@@ -699,7 +699,8 @@ import {
getSurveyList,
getSearchCountry,
getSearchResult,
getSearchAOMeasures,
getSearchAllOrg,
getSearchAllCountry,
getStatAreaCompanyList,
getCompanyPlace
} from "@/api/marketAccessRestrictions/index";
......@@ -711,6 +712,7 @@ import getBarChart from "./utils/barChart1";
import DefaultUserIcon from "@/assets/icons/default-icon1.png";
import DefaultCompanyIcon from "@/assets/icons/default-icon2.png";
import DefaultNewsIcon from "@/assets/icons/default-icon-news.png";
import { reduce } from "lodash";
// 首页分类
const sortInfo = ref([{}]);
......@@ -1426,15 +1428,14 @@ const surveyYearList = ref([
id: "2021"
}
]);
const checkedSurveyYears = ref(["2025"]);
const checkedSurveyYears = ref([]);
const handleChangeCheckedSurveyYears = () => {
handleGetSurveyList();
};
const areaList = ref([
// { id: "1", name: "人工智能" },
]);
const checkedAreaList = ref(["1"]);
const checkedAreaList = ref([]);
const handleGetAreaList = async () => {
try {
const res = await getHylyList();
......@@ -1471,14 +1472,23 @@ const insList = ref([
id: "491"
}
]);
const checkedInsList = ref(["54"]);
const checkedInsList = ref([]);
const handleGetInsList = async() => {
const params = {
sortCode: activeCateId.value
}
// const params = {
// sortCode: activeCateId.value
// }
try {
const res = await getSearchAOMeasures(params)
const res = await getSearchAllOrg()
console.log('发布机构', res);
if(res.code === 200 && res.data) {
insList.value = res.data.map(item => {
return {
name: item.ORGNAME,
id: item.ORGID
}
})
// checkedInsList.value = [insList.value[0].id]
}
} catch (error) {
......@@ -1510,32 +1520,52 @@ const countryList = ref([
id: "韩国"
}
]);
const checkedCountryList = ref(["0101"]);
const checkedCountryList = ref([]);
const handleGetAllSearchCountry = async () => {
try {
const res = await getSearchAllCountry()
console.log('受调查国家/地区', res);
if(res.code && res.data) {
countryList.value = res.data.map(item => {
return {
name: item.COUNTRYNAME,
id: item.COUNTRYID
}
})
// checkedCountryList.value = [countryList.value[0].id]
}
} catch (error) {
}
}
handleGetAllSearchCountry()
const handleChangeCheckedCountry = () => {
// console.log(checkedAreaList.value);
handleGetSurveyList();
};
const surveyInfoList = ref([
{
time: "2025 11月12日",
survey: "337",
title: "外国制造的半导体器件及其下游产品和组件",
content:
"美国国际贸易委员会(ITC)投票决定对特定半导体器件及其下游计算产品和组件(Certain Semiconductor Devices, Computing Products Containing the Same,and Components Thereof)启动337调查。",
status: "部分终裁",
areaList: ["集成电路"],
countryList: ["a", "b"]
},
{
time: "202511月12日",
survey: "337",
title: "外国制造的半导体器件及其下游产品和组件",
content:
"美国国际贸易委员会(ITC)投票决定对特定半导体器件及其下游计算产品和组件(Certain Semiconductor Devices, Computing Products Containing the Same,and Components Thereof)启动337调查。",
status: "部分终裁",
areaList: ["集成电路"]
}
// {
// time: "2025 11月12日",
// survey: "337",
// title: "外国制造的半导体器件及其下游产品和组件",
// content:
// "美国国际贸易委员会(ITC)投票决定对特定半导体器件及其下游计算产品和组件(Certain Semiconductor Devices, Computing Products Containing the Same,and Components Thereof)启动337调查。",
// status: "部分终裁",
// areaList: ["集成电路"],
// countryList: ["a", "b"]
// },
// {
// time: "202511月12日",
// survey: "337",
// title: "外国制造的半导体器件及其下游产品和组件",
// content:
// "美国国际贸易委员会(ITC)投票决定对特定半导体器件及其下游计算产品和组件(Certain Semiconductor Devices, Computing Products Containing the Same,and Components Thereof)启动337调查。",
// status: "部分终裁",
// areaList: ["集成电路"]
// }
]);
const handleGetSurveyList = async () => {
......@@ -1556,6 +1586,9 @@ const handleGetSurveyList = async () => {
if (res.code === 200 && res.data) {
totalDiscussNum.value = res.data.totalElements;
surveyInfoList.value = res.data.content;
surveyInfoList.value.forEach(item => {
item.SORTIMAGEURL = `http://${item.SORTIMAGEURL}`
})
} else {
surveyInfoList.value = [];
}
......@@ -3279,7 +3312,11 @@ onMounted(async () => {
width: 24px;
height: 24px;
border-radius: 12px;
background: orange;
overflow: hidden;
img{
width: 100%;
height: 100%;
}
}
}
}
......
......@@ -81,7 +81,7 @@
:pager-count="5"
small
/>
<span class="total-info">{{ totalElements }}结果</span>
<span class="total-info">{{ totalElements }}</span>
</div>
</div>
</div>
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论